From c71757a513b4f83dae517db6fecd6ab1739a15de Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 3 Oct 2018 08:04:21 +0000
Subject: 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
---
 src/cmake/modules/GUDHI_compilation_flags.cmake | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/cmake')

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")
-- 
cgit v1.2.3