From d95c0d8f3d28067527116a2c1eac06f5bf083995 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 28 Sep 2018 09:00:25 +0000
Subject: https://gitlab.inria.fr/GUDHI/gudhi-devel/issues/32 - [Cmake - Qt5]
 CMake outputs an error when Qt5 is not installed Modify/add cmake messages
 for missing modules

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/cmake_missing_modules_clarification_vincent@3912 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 37e1035f7c27ce994e05386801d72959696de7d4
---
 CMakeLists.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afacede9..d61df992 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,10 @@ include(CMakeGUDHIVersion.txt)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/")
 
+# Reset cache
+set(GUDHI_MODULES "" CACHE INTERNAL "GUDHI_MODULES")
+set(GUDHI_MISSING_MODULES "" CACHE INTERNAL "GUDHI_MISSING_MODULES")
+
 # This variable is used by Cython CMakeLists.txt and by GUDHI_third_party_libraries to know its path
 set(GUDHI_CYTHON_PATH "src/cython")
 
@@ -37,8 +41,6 @@ add_gudhi_module(Tangential_complex)
 add_gudhi_module(Witness_complex)
 add_gudhi_module(Nerve_GIC)
 
-message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"")
-
 # Include module CMake subdirectories
 # GUDHI_SUB_DIRECTORIES is managed in CMAKE_MODULE_PATH/GUDHI_modules.cmake
 foreach(GUDHI_MODULE ${GUDHI_MODULES})
@@ -54,9 +56,15 @@ add_subdirectory(src/GudhUI)
 if (WITH_GUDHI_PYTHON)
   # specific for cython module
   add_subdirectory(${GUDHI_CYTHON_PATH})
+else()
+  message("++ Python module will not be compiled because WITH_GUDHI_PYTHON is set to OFF")
+  set(GUDHI_MISSING_MODULES ${GUDHI_MISSING_MODULES} "python")
 endif()
 
 # For "make user_version" - Requires GUDHI_modules to be performed
 include(GUDHI_user_version_target)
 # For "make doxygen" - Requires GUDHI_USER_VERSION_DIR to be set - Done in GUDHI_user_version_target for dev version
 include(GUDHI_doxygen_target)
+
+message("++ GUDHI_MODULES list is:\"${GUDHI_MODULES}\"")
+message("++ GUDHI_MISSING_MODULES list is:\"${GUDHI_MISSING_MODULES}\"")
-- 
cgit v1.2.3


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
---
 CMakeLists.txt                                  |  2 --
 src/cmake/modules/GUDHI_compilation_flags.cmake | 13 ++++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'CMakeLists.txt')

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