diff options
| author | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-05-16 08:16:49 +0000 |
|---|---|---|
| committer | mcarrier <mcarrier@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-05-16 08:16:49 +0000 |
| commit | 5a78c67dafc7a664d9b3c248bf2781c770393c68 (patch) | |
| tree | a33408af4abedf120df65cb0b4f17d0cd3a26dd1 /CMakeLists.txt | |
| parent | cce99f5f66d0eb4da5a12b145c29579cf7656185 (diff) | |
| parent | 044c3fbd3634871805bc130dcad8f08ecd510784 (diff) | |
Merged latest trunk changes to Nerve_GIC
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2431 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 866ddfadee8160dfaa46b8d703fd8d8d4476892a
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f9029bb1..bcaff1e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIdev) include(CMakeGUDHIVersion.txt) -# Generate GUDHI official version file -configure_file(GUDHIVersion.cmake.in "${CMAKE_SOURCE_DIR}/GUDHIVersion.cmake" @ONLY) set(CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/") @@ -15,11 +13,11 @@ enable_testing() # For "make user_version" include("${CMAKE_MODULE_PATH}/GUDHI_user_version_target.txt") # For "make doxygen" -include("${CMAKE_MODULE_PATH}/GUDHI_doxygen_target.txt") +include(GUDHI_doxygen_target) # This variable is used by Cython CMakeLists.txt to know its path set(GUDHI_CYTHON_PATH "src/cython") # For third parties libraries management - To be done last as CGAL updates CMAKE_MODULE_PATH -include("${CMAKE_MODULE_PATH}/GUDHI_third_party_libraries.txt") +include(GUDHI_third_party_libraries) if(MSVC) # Turn off some VC++ warnings |