From 8a3b506532a92f3c2e20849131f8a0450b1c8dd4 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Mon, 20 Dec 2021 23:59:57 +0300 Subject: [PATCH] Disable c++ extensions --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df02be8..c012ea2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ endif(CCACHE_FOUND) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) +set(CMAKE_CXX_EXTENSIONS OFF) find_package(Qt5 COMPONENTS LinguistTools Core Widgets Gui Network Qml REQUIRED) @@ -240,6 +241,7 @@ add_executable(novacoin-qt ${ALL_SOURCES}) target_include_directories(novacoin-qt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/qt ${CMAKE_CURRENT_SOURCE_DIR}/src/json ${BerkeleyDB_INC} ${CMAKE_CURRENT_SOURCE_DIR}/src/additional/leveldb/helpers ${CMAKE_CURRENT_SOURCE_DIR}/src/additional/libqrencode ${Boost_INCLUDE_DIRS}) target_link_libraries(novacoin-qt ${ALL_LIBRARIES}) +target_compile_features(novacoin-qt PUBLIC cxx_std_17) set_property(TARGET novacoin-qt PROPERTY CXX_STANDARD 17) set_property(TARGET novacoin-qt PROPERTY CXX_STANDARD_REQUIRED TRUE) set_property(TARGET novacoin-qt PROPERTY COMPILE_DEFINITIONS ${ALL_DEFINITIONS}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 94366fe..0e78bf5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,6 +20,7 @@ endif(CCACHE_FOUND) set (CMAKE_C_FLAGS "-flto -O3 -fPIC -Wno-deprecated -fstack-protector-all -Wstack-protector -D_FORTIFY_SOURCE=2") set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fexceptions -frtti") +set(CMAKE_CXX_EXTENSIONS OFF) set(Boost_USE_STATIC_LIBS ON) find_package(Boost REQUIRED COMPONENTS atomic chrono filesystem program_options system thread) @@ -153,6 +154,7 @@ add_executable(novacoind ${ALL_SOURCES}) target_include_directories(novacoind PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/json ${BerkeleyDB_INC} ${CMAKE_CURRENT_SOURCE_DIR}/additional/leveldb/helpers ${Boost_INCLUDE_DIRS}) target_link_libraries(novacoind ${ALL_LIBRARIES}) +target_compile_features(novacoind PUBLIC cxx_std_17) set_property(TARGET novacoind PROPERTY CXX_STANDARD 17) set_property(TARGET novacoind PROPERTY CXX_STANDARD_REQUIRED TRUE) set_property(TARGET novacoind PROPERTY COMPILE_DEFINITIONS ${ALL_DEFINITIONS}) -- 1.7.1