1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
|
Description: removing upstream compiler flags, to accept the default C++
version and avoid -fPIC for static libs.
Just letting DNDEBUG flag to deactivate meaningless asserts.
Author: Pierre Gruet <pgt@debian.org>
Forwarded: not-needed
Last-Update: 2021-11-29
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,57 +82,8 @@
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
-IF (NOT MSVC)
- # Detect if the compiler supports C+11
- INCLUDE(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
- CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
- IF(COMPILER_SUPPORTS_CXX14)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
- ELSEIF(COMPILER_SUPPORTS_CXX11)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- ELSEIF(COMPILER_SUPPORTS_CXX0X)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
- ELSE()
- MESSAGE(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
- ENDIF()
- SET(PTHREAD_LIBRARY "-lpthread")
-ELSE()
- IF(MSVC_VERSION LESS 1800)
- MESSAGE(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no decent C++11 support. Please use a different C++ compiler.")
- ENDIF()
- ADD_COMPILE_OPTIONS(/bigobj /EHsc)
-ENDIF(NOT MSVC)
-
-# Update flags according to the compiler
-IF (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
- IF (APPLE)
- SET(CLANG_SANITIZE_FLAGS "")
- ELSE(APPLE)
- #SET(CLANG_SANITIZE_FLAGS " -fsanitize=undefined-trap,memory -fsanitize-memory-track-origins -fno-omit-frame-pointer ")
- #SET(CLANG_SANITIZE_FLAGS " -fsanitize=undefined-trap -fno-omit-frame-pointer ")
- SET(CLANG_SANITIZE_FLAGS "")
- ENDIF(APPLE)
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 ${CLANG_SANITIZE_FLAGS}")
- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3 -DNDEBUG -DBOOST_DISABLE_ASSERTS")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fPIC -O2 -DNDEBUG -g -DBOOST_DISABLE_ASSERTS")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra -Wfloat-equal -Wno-system-headers ")
-ELSEIF (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
- IF (APPLE)
- SET(GCC_SANITIZE_FLAGS "")
- ELSE(APPLE)
- SET(GCC_SANITIZE_FLAGS "")
- ENDIF(APPLE)
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 ")
- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -DNDEBUG -DBOOST_DISABLE_ASSERTS")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -DNDEBUG -DBOOST_DISABLE_ASSERTS")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-long-long -Winit-self -Wfloat-equal -Wsign-compare -pedantic -funroll-all-loops -ffast-math -fno-strict-aliasing -ftree-vectorize -fPIC")
-ELSEIF(${CMAKE_CXX_COMPILER_ID} MATCHES Intel)
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fpic -O1 -g -ftrapuv")
- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fpic -O3 -DNDEBUG -DBOOST_DISABLE_ASSERTS")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fpic -O2 -DNDEBUG -DBOOST_DISABLE_ASSERTS")
-ENDIF()
+# Setting -DNDEBUG to remove some low-importance asserts of which success depends on the machine
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
# Find OpenMP
FIND_PACKAGE(OpenMP)
|