From 9c7c3c6d22b5ae4d3d3c2952bcd0cb37f36c9eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Mon, 29 Jul 2019 18:57:27 +0200 Subject: [PATCH] Allow to use new compiler flags in clang --- cmake/compilerFlags.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake index 426d0599..cb8f30b2 100644 --- a/cmake/compilerFlags.cmake +++ b/cmake/compilerFlags.cmake @@ -7,7 +7,7 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN set(COMPILER_IS_CLANG ON) endif() - set (CMAKE_CXX_FLAGS_DEBUG "-g3 -gstrict-dwarf -O0") + set (CMAKE_CXX_FLAGS_DEBUG "-g3 -gstrict-dwarf -O0") if (CMAKE_GENERATOR MATCHES "Xcode") set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0") @@ -20,14 +20,17 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN endif() endif() - if (COMPILER_IS_GCC) - add_compile_options(-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS) - if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0 ) - add_compile_options(-fstack-clash-protection -fcf-protection) - endif() + if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) + add_compile_options(-fstack-clash-protection -fcf-protection) endif() if (COMPILER_IS_GCC OR COMPILER_IS_CLANG) + add_compile_options(-Wp,-D_GLIBCXX_ASSERTIONS) + + if (CMAKE_BUILD_TYPE STREQUAL Release) + add_compile_options(-Wp,-D_FORTIFY_SOURCE=2) # Requires to compile with -O2 + endif() + if(BUILD_WITH_COVERAGE) # Note: We tried to use here add_compile_options but we got linker errors on Travis-CI set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fprofile-arcs -ftest-coverage")