diff options
| author | tobtoht <tob@featherwallet.org> | 2025-02-24 18:18:53 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2025-02-24 18:18:53 +0000 |
| commit | 302197019398140499ef985047079bf8a2b7f833 (patch) | |
| tree | 7836b3c0c7dc2968abf05b498fa37404f683e0bd | |
| parent | 351f4aba1c7fb5df1d48e27c54a131d8a95725f8 (diff) | |
| parent | 82714e6d266f64f7273eea5131806e68c8652e63 (diff) | |
| download | monzero-gui-302197019398140499ef985047079bf8a2b7f833.tar.gz monzero-gui-302197019398140499ef985047079bf8a2b7f833.tar.xz monzero-gui-302197019398140499ef985047079bf8a2b7f833.zip | |
Merge pull request #4381
82714e6d build: set cxx standard to 17 in dev mode (tobtoht)
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 55f426cc..df41459f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,14 @@ option(WITH_DESKTOP_ENTRY "Ask to install desktop entry on first startup" ON) option(WITH_UPDATER "Regularly check for new updates" ON) option(DEV_MODE "Checkout latest monero master on build" OFF) +if(DEV_MODE) + # DEV_MODE checks out the monero submodule to master, which requires C++17. + set(CMAKE_CXX_STANDARD 17) +else() + set(CMAKE_CXX_STANDARD 11) +endif() +set(CMAKE_CXX_STANDARD_REQUIRED ON) + list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake") include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) @@ -356,7 +364,7 @@ if(APPLE) endif() if (APPLE AND NOT IOS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -std=c++11") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default") endif() if(APPLE) @@ -442,7 +450,7 @@ message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}") message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_SECURITY_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}") add_subdirectory(translations) |