From 2c92e83afa2e45e425952da1475086c0b1b576cc Mon Sep 17 00:00:00 2001 From: Bernd Amend Date: Sat, 22 May 2021 14:54:38 +0200 Subject: [PATCH] drop CPP17_FLAG since cmake is already taking care of it --- CMakeLists.txt | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbd431d8..3fe7df2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,12 +145,6 @@ else() set(READLINE_FLAG) endif() -if(CMAKE_COMPILER_IS_GNUCC) - execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) - - set(CPP17_FLAG "-std=c++1z") -endif() - if(MSVC) add_definitions(/std:c++latest /W4 /w14545 /w34242 /w34254 /w34287 /w44263 /w44265 /w44296 /w44311 /w44826 /we4289 /w14546 /w14547 /w14549 /w14555 /w14619 /w14905 /w14906 /w14928) @@ -175,7 +169,7 @@ if(MSVC) # how to workaround or fix the error. So I'm disabling it globally. add_definitions(/wd4503) else() - add_definitions(-Wall -Wextra -Wconversion -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wcast-qual -Wunused -Woverloaded-virtual -Wno-noexcept-type -Wpedantic ${CPP17_FLAG}) + add_definitions(-Wall -Wextra -Wconversion -Wshadow -Wnon-virtual-dtor -Wold-style-cast -Wcast-align -Wcast-qual -Wunused -Woverloaded-virtual -Wno-noexcept-type -Wpedantic -Werror=return-type) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") add_definitions(-Weverything -Wno-c++98-compat-pedantic -Wno-c++98-compat -Wno-documentation -Wno-switch-enum -Wno-weak-vtables -Wno-missing-prototypes -Wno-padded -Wno-missing-noreturn -Wno-exit-time-destructors -Wno-documentation-unknown-command -Wno-unused-template -Wno-undef ) @@ -193,12 +187,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if(USE_LIBCXX) add_definitions(-stdlib=libc++) - set(LINKER_FLAGS "${LINKER_FLAGS} ${CPP17_FLAG} -stdlib=libc++") - else() - set(LINKER_FLAGS "${LINKER_FLAGS} ${CPP17_FLAG}") + set(LINKER_FLAGS "${LINKER_FLAGS} -stdlib=libc++") endif() -elseif(CMAKE_COMPILER_IS_GNUCC) - set(LINKER_FLAGS "${LINKER_FLAGS} ${CPP17_FLAG}") endif() # limitations in MinGW require us to make an optimized build @@ -429,7 +419,6 @@ if(BUILD_TESTING) endif() - if(BUILD_LIBFUZZ_TESTER) add_executable(fuzzer src/libfuzzer_client.cpp src/sha3.cpp) target_compile_options(fuzzer PRIVATE "-fsanitize=fuzzer,address")