diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-06 19:21:39 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-04-06 19:21:39 +0000 |
| commit | 94638281f656211b429ee20ed6be25a84db8074c (patch) | |
| tree | 2687e8ad685615b013e536033e5517f73397c7ff | |
| parent | aa1b1f242900b678e29f93ab3439c59e93fdda4b (diff) | |
GUDHIConfig.cmake fix
Modules were missing in src/CMakeLists.txt
generate_version.sh must copy GUDHIConfig.cmake and not GUDHIConfig.cmake.in
nor CMakeGUDHIVersion.txt
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1100 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2b618b7a395017cb1bde8a9a7afd7c9e54c29710
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/generate_version.sh | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index abb66ec2..e35da63e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(GUDHIdev) include(CMakeGUDHIVersion.txt) # Generate GUDHI official version file -configure_file(GUDHIVersion.cmake.in "${PROJECT_BINARY_DIR}/GUDHIVersion.cmake" @ONLY) +configure_file(GUDHIVersion.cmake.in "${CMAKE_SOURCE_DIR}/GUDHIVersion.cmake" @ONLY) find_package(Boost REQUIRED COMPONENTS system filesystem unit_test_framework chrono timer program_options thread REQUIRED) diff --git a/scripts/generate_version.sh b/scripts/generate_version.sh index 323396dc..4482c506 100755 --- a/scripts/generate_version.sh +++ b/scripts/generate_version.sh @@ -45,7 +45,6 @@ mkdir "$VERSION_DIR" # TOP LEVEL FILE COPY cp $VERSION_FILE $VERSION_DIR -cp $ROOT_DIR/CMakeGUDHIVersion.txt $VERSION_DIR cp $ROOT_DIR/README $VERSION_DIR cp $ROOT_DIR/Conventions.txt $VERSION_DIR cp $ROOT_DIR/COPYING $VERSION_DIR @@ -55,7 +54,7 @@ cp $ROOT_DIR/src/Doxyfile $VERSION_DIR cp -R $ROOT_DIR/biblio $VERSION_DIR cp $ROOT_DIR/src/GUDHIConfigVersion.cmake.in $VERSION_DIR cp $ROOT_DIR/src/GUDHIConfig.cmake.in $VERSION_DIR -cp $ROOT_DIR/GUDHIVersion.cmake.in $VERSION_DIR +cp $ROOT_DIR/GUDHIVersion.cmake $VERSION_DIR # PACKAGE LEVEL COPY PACKAGE_INC_DIR="/include" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 40b7dd58..42d3755a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.6) project(GUDHI) -include("CMakeGUDHIVersion.txt") - enable_testing() list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") @@ -66,10 +64,10 @@ else() # Gudhi compilation part include_directories(include) - #add_subdirectory(example/Simplex_tree) - #add_subdirectory(example/Persistent_cohomology) - #add_subdirectory(example/Skeleton_blocker) - #add_subdirectory(example/Contraction) + add_subdirectory(example/Simplex_tree) + add_subdirectory(example/Persistent_cohomology) + add_subdirectory(example/Skeleton_blocker) + add_subdirectory(example/Contraction) add_subdirectory(example/Bitmap_cubical_complex) add_subdirectory(example/Witness_complex) |