Merge last trunk modifications

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

Former-commit-id: 0e5b89e0ea0d69ebfdb74ba3bbf29518f7ce5ce8

1 files changed, 55 insertions, 43 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93e72dd2..dc6de64d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,66 +2,78 @@ cmake_minimum_required(VERSION 2.6)
 project(GUDHIdev)
 
 include(CMakeGUDHIVersion.txt)
-
-if (NOT CMAKE_BUILD_TYPE)
- # Set default build type to Release
- set(CMAKE_BUILD_TYPE "Release")
-endif()
-
-enable_testing()
-
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/")
-message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
-
 # Generate GUDHI official version file
 configure_file(GUDHIVersion.cmake.in "${PROJECT_BINARY_DIR}/GUDHIVersion.cmake" @ONLY)
 
 find_package(Boost REQUIRED COMPONENTS system filesystem unit_test_framework chrono timer program_options thread REQUIRED)
 
-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")
+if(NOT Boost_FOUND)
+  message(FATAL_ERROR "NOTICE: This demo requires Boost and will not be compiled.")
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=c++11 -Wall -Wpedantic -Wsign-compare")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb -O1")	
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-endif()
 
-set(Boost_USE_STATIC_LIBS        ON)
-set(Boost_USE_MULTITHREADED      ON)
-set(Boost_USE_STATIC_RUNTIME    OFF)
+  set(CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/")
+  set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/")
+  message("CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
+  message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")
 
-find_package(GMP)
-if(GMP_FOUND)
-	find_package(GMPXX)
-endif()
+  enable_testing()
 
-find_package(CGAL)
+  find_package(GMP)
+  if(GMP_FOUND)
+    INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
+    find_package(GMPXX)
+    if(GMPXX_FOUND)
+      INCLUDE_DIRECTORIES(${GMPXX_INCLUDE_DIR})
+    endif()
+  endif()
 
-# Find TBB package for parallel sort - not mandatory, just optional.
-set(TBB_FIND_QUIETLY ON)
-find_package(TBB)
+  # In CMakeLists.txt, when include(${CGAL_USE_FILE}), CMAKE_CXX_FLAGS are overwritten.
+  # cf. http://doc.cgal.org/latest/Manual/installation.html#title40
+  # A workaround is to include(${CGAL_USE_FILE}) before adding "-std=c++11".
+  # A fix would be to use https://cmake.org/cmake/help/v3.1/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html 
+  # or even better https://cmake.org/cmake/help/v3.1/variable/CMAKE_CXX_STANDARD.html
+  # but it implies to use cmake version 3.1 at least.
+  find_package(CGAL)
+  if(CGAL_FOUND)
+    include( ${CGAL_USE_FILE} )
+  endif()
+  
+  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")
+  else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wpedantic -Wsign-compare")
+  endif()
 
-# Required programs for unitary tests purpose
-FIND_PROGRAM( GCOVR_PATH gcovr )
-if (GCOVR_PATH)
-  message("gcovr found in ${GCOVR_PATH}")
-endif()
-# Required programs for unitary tests purpose
-FIND_PROGRAM( GPROF_PATH gprof )
-if (GPROF_PATH)
-  message("gprof found in ${GPROF_PATH}")
-endif()
+  if(CMAKE_BUILD_TYPE MATCHES Debug)
+    message("++ Debug compilation flags are: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+  else()
+    message("++ Release compilation flags are: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
+  endif()
 
+  set(Boost_USE_STATIC_LIBS        ON)
+  set(Boost_USE_MULTITHREADED      ON)
+  set(Boost_USE_STATIC_RUNTIME    OFF)
+
+  # Find TBB package for parallel sort - not mandatory, just optional.
+  set(TBB_FIND_QUIETLY ON)
+  find_package(TBB)
+
+  # Required programs for unitary tests purpose
+  FIND_PROGRAM( GCOVR_PATH gcovr )
+  if (GCOVR_PATH)
+    message("gcovr found in ${GCOVR_PATH}")
+  endif()
+  # Required programs for unitary tests purpose
+  FIND_PROGRAM( GPROF_PATH gprof )
+  if (GPROF_PATH)
+    message("gprof found in ${GPROF_PATH}")
+  endif()
 FIND_PROGRAM( DIFF_PATH diff )
 if (DIFF_PATH)
   message("diff found in ${DIFF_PATH}")
 endif()
 
-
-if(NOT Boost_FOUND)
-  message(FATAL_ERROR "NOTICE: This demo requires Boost and will not be compiled.")
-else()
   # BOOST ISSUE result_of vs C++11
   add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
   # BOOST ISSUE with Libraries name resolution under Windows