mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-25 16:22:47 +01:00
CMakeLists: Make use of /std:c++latest on MSVC
Provides the buildbot with one builder that is always tracking the latest version of the C++ standard, allowing us to progressively rectify our code and amend any differences between standards over time instead of waiting for a complete standard change, potentially breaking a lot of code all at once.
This commit is contained in:
parent
995067538d
commit
fb0fefc75c
2 changed files with 11 additions and 4 deletions
|
@ -118,8 +118,15 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
|
||||||
# Configure C++ standard
|
# Configure C++ standard
|
||||||
# ===========================
|
# ===========================
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
if (MSVC)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
add_compile_options(/std:c++latest)
|
||||||
|
|
||||||
|
# cubeb and boost still make use of deprecated result_of.
|
||||||
|
add_definitions(-D_HAS_DEPRECATED_RESULT_OF)
|
||||||
|
else()
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Output binaries to bin/
|
# Output binaries to bin/
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
|
||||||
|
|
|
@ -531,8 +531,8 @@ void GameList::AddPermDirPopup(QMenu& context_menu, QModelIndex selected) {
|
||||||
UISettings::GameDir& game_dir =
|
UISettings::GameDir& game_dir =
|
||||||
*selected.data(GameListDir::GameDirRole).value<UISettings::GameDir*>();
|
*selected.data(GameListDir::GameDirRole).value<UISettings::GameDir*>();
|
||||||
|
|
||||||
QAction* move_up = context_menu.addAction(tr(u8"\U000025b2 Move Up"));
|
QAction* move_up = context_menu.addAction(tr("\u25B2 Move Up"));
|
||||||
QAction* move_down = context_menu.addAction(tr(u8"\U000025bc Move Down "));
|
QAction* move_down = context_menu.addAction(tr("\u25bc Move Down"));
|
||||||
QAction* open_directory_location = context_menu.addAction(tr("Open Directory Location"));
|
QAction* open_directory_location = context_menu.addAction(tr("Open Directory Location"));
|
||||||
|
|
||||||
const int row = selected.row();
|
const int row = selected.row();
|
||||||
|
|
Loading…
Reference in a new issue