diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-10-03 08:04:21 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-10-03 08:04:21 +0000 |
| commit | c71757a513b4f83dae517db6fecd6ab1739a15de (patch) | |
| tree | cdab7759f98fb5ed8b26b92e8f0f8b1bc2e753a2 | |
| parent | 84fe516ada4f0ada3e9a1112d8f7cb76656178ca (diff) | |
Modify "-pedantic" compiler option management in order to be traced
Modify windows warning level
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_warning_removal_vincent@3926 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1c6e61fb968b6b4072b86a520e2edf78aedf1ffa
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cmake/modules/GUDHI_compilation_flags.cmake | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d61df992..76e5b528 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,6 @@ set(GUDHI_CYTHON_PATH "src/cython") include(GUDHI_third_party_libraries NO_POLICY_SCOPE) include(GUDHI_compilation_flags) -# Only for dev version -add_cxx_compiler_flag("-pedantic") # Add your new module in the list, order is not important include(GUDHI_modules) diff --git a/src/cmake/modules/GUDHI_compilation_flags.cmake b/src/cmake/modules/GUDHI_compilation_flags.cmake index a01d6e13..86cd531b 100644 --- a/src/cmake/modules/GUDHI_compilation_flags.cmake +++ b/src/cmake/modules/GUDHI_compilation_flags.cmake @@ -5,7 +5,7 @@ include(CheckCXXSourceCompiles) # add a compiler flag only if it is accepted macro(add_cxx_compiler_flag _flag) - string(REPLACE "-" "_" _flag_var ${_flag}) + string(REPLACE "-" "_" "/" _flag_var ${_flag}) check_cxx_accepts_flag("${_flag}" CXX_COMPILER_${_flag_var}_OK) if(CXX_COMPILER_${_flag_var}_OK) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flag}") @@ -43,12 +43,15 @@ set (CMAKE_CXX_STANDARD 11) enable_testing() if(MSVC) - # Turn off some VC++ warnings - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4668 /wd4311 /wd4800 /wd4820 /wd4503 /wd4244 /wd4345 /wd4996 /wd4396 /wd4018") + add_cxx_compiler_flag("/W3") +else() + add_cxx_compiler_flag("-Wall") + # Only for dev version + if(PROJECT_NAME STREQUAL "GUDHIdev") + add_cxx_compiler_flag("-pedantic") + endif() endif() -add_cxx_compiler_flag("-Wall") - if (DEBUG_TRACES) # For programs to be more verbose message(STATUS "DEBUG_TRACES are activated") |