diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-11-06 14:27:18 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-11-06 14:27:18 +0000 |
commit | 606115b399b010b8ebfbf13f6a8ca2b1c1bf17cd (patch) | |
tree | f13206921b7b77ca3d2cc66c4ed612300bdaebd8 /CMakeLists.txt | |
parent | dd2a15d1a8d2607848527513210330baebce9e8e (diff) | |
parent | 72f647ad4b802d08072925a374324e7ace4b2c4d (diff) |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bitmap@889 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: d90cb012ff7f3a9070ea19e3c6651cc455bebdad
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 43e0558c..e4ad73af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIdev) +include(CMakeGUDHIVersion.txt) +# 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) set(CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/src/cmake/modules/") @@ -72,18 +76,16 @@ else() add_subdirectory(src/Skeleton_blocker/test) add_subdirectory(src/Skeleton_blocker/example) add_subdirectory(src/Contraction/example) - add_subdirectory(src/Hasse_complex/example) - add_subdirectory(src/Bottleneck/example) - add_subdirectory(src/Bottleneck/test) add_subdirectory(src/Bitmap_cubical_complex/example) add_subdirectory(src/Bitmap_cubical_complex/test) - # GudhUI - add_subdirectory(src/GudhUI) - # data points generator add_subdirectory(data/points/generator) + # Please let GudhUI in last compilation position as QT is known to modify CMAKE_CXX_FLAGS + # GudhUI + add_subdirectory(src/GudhUI) + endif() |