diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-11-14 10:04:30 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-11-14 10:04:30 +0000 |
| commit | 7b64e122ccda2f592a1a20c339318880302a92ed (patch) | |
| tree | 610c9fc09c688ab58e481312743acb3cf6d233d9 /src/cmake/modules/GUDHI_compilation_flags.cmake | |
| parent | 4e4b190e9f3937f3f136c83e42c3c9322074f16a (diff) | |
| parent | d121955a744c87e6b4ebbe42b42fb2321a32e9e3 (diff) | |
Merge last trunk modifications and resolve conflict on src/Alpha_complex/utilities/alphacomplex.md
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alpha_complex_3d_module_vincent@3979 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2a63709432810154d7939e9bdd74f9d55d0aee43
Diffstat (limited to 'src/cmake/modules/GUDHI_compilation_flags.cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_compilation_flags.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
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") |