summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--GUDHIVersion.cmake.in1
-rwxr-xr-xscripts/generate_version.sh124
-rw-r--r--src/Bitmap_cubical_complex/example/CMakeLists.txt27
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/cmake/modules/GUDHI_user_version_target.txt2
6 files changed, 23 insertions, 135 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aef771d0..35604652 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/")
diff --git a/GUDHIVersion.cmake.in b/GUDHIVersion.cmake.in
deleted file mode 100644
index 2f433c1c..00000000
--- a/GUDHIVersion.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-@GUDHI_VERSION@
diff --git a/scripts/generate_version.sh b/scripts/generate_version.sh
deleted file mode 100755
index f999c6c4..00000000
--- a/scripts/generate_version.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-#usage bash generate_version.sh : dont generate if svn st non empty
-#usage bash generate_version.sh -f : generate even if svn is empty
-#usage bash generate_version.sh -f DIR : generate even if svn is empty and save library in dir
-#
-# 23/06/2015 - Remove source, add biblio, and doc
-# 06/10/2015 - Replace static Version.txt with generated GUDHIVersion.cmake file
-# VERSION CHECK
-ROOT_DIR=..
-VERSION_FILE="$ROOT_DIR/GUDHIVersion.cmake"
-
-if [ ! -f $VERSION_FILE ]; then
- echo "File not found! : $VERSION_FILE - Please launch cmake first to generate file"
- exit 1
-fi
-
-# SVN STATUS CHECK OR IF FORCED BY USER
-if [ "$1" != "-f" ]
-then
- SVN_STATUS=`svn status $ROOT_DIR | grep -v $VERSION_FILE`
- echo $SVN_STATUS
-fi
-
-
-TARGET_DIR=""
-if [ "$2" != "-f" ]
-then
- TARGET_DIR=$2
- echo "Install folder : $TARGET_DIR"
-fi
-
-if [ "$SVN_STATUS" != "" ]
-then
- echo "Svn status must be empty to create a version!"
- exit 1
-fi
-
-# TEMPORARY FOLDER CREATION
-VERSION_DATE=`date +"%Y-%m-%d-%H-%M-%S"`
-GUDHI="_GUDHI_"
-VERSION_REVISION=`cat $VERSION_FILE`
-VERSION_DIR="$VERSION_DATE$GUDHI$VERSION_REVISION"
-echo $VERSION_DIR
-mkdir "$VERSION_DIR"
-
-# TOP LEVEL FILE COPY
-cp $ROOT_DIR/README $VERSION_DIR
-cp $ROOT_DIR/Conventions.txt $VERSION_DIR
-cp $ROOT_DIR/COPYING $VERSION_DIR
-cp -R $ROOT_DIR/data $VERSION_DIR
-cp $ROOT_DIR/src/CMakeLists.txt $VERSION_DIR
-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/CMakeGUDHIVersion.txt $VERSION_DIR
-cp $ROOT_DIR/GUDHIVersion.cmake.in $VERSION_DIR
-
-# PACKAGE LEVEL COPY
-PACKAGE_INC_DIR="/include"
-PACKAGE_EX_DIR="/example"
-PACKAGE_CONCEPT_DIR="/concept"
-PACKAGE_DOC_DIR="/doc"
-for package in `ls $ROOT_DIR/src/`
-do
- if [ -d "$ROOT_DIR/src/$package" ] && [ $package != "Bottleneck" ]
- then
- echo $package
- if [ "$package" == "cmake" ]
- then
- # SPECIFIC FOR CMAKE MODULES
- cp -R $ROOT_DIR/src/$package $VERSION_DIR
- elif [ "$package" == "GudhUI" ]
- then
- # SPECIFIC FOR GUDHI USER INTERFACE
- cp -R $ROOT_DIR/src/$package $VERSION_DIR
- elif [ "$package" == "cython" ]
- then
- # SPECIFIC FOR CYTHON INTERFACE
- cp -R $ROOT_DIR/src/$package $VERSION_DIR
- else
- # PACKAGE COPY
- if [ -d "$ROOT_DIR/src/$package$PACKAGE_INC_DIR" ]
- then
- if [ ! -d "$VERSION_DIR$PACKAGE_INC_DIR" ]
- then
- # MUST CREATE DIRECTORY ON FIRST LOOP
- mkdir $VERSION_DIR$PACKAGE_INC_DIR
- fi
- cp -R $ROOT_DIR/src/$package$PACKAGE_INC_DIR/* $VERSION_DIR$PACKAGE_INC_DIR/
- fi
- if [ -d "$ROOT_DIR/src/$package$PACKAGE_EX_DIR" ]
- then
- mkdir -p $VERSION_DIR$PACKAGE_EX_DIR/$package
- cp -R $ROOT_DIR/src/$package$PACKAGE_EX_DIR/* $VERSION_DIR$PACKAGE_EX_DIR/$package
- fi
- if [ -d "$ROOT_DIR/src/$package$PACKAGE_CONCEPT_DIR" ]
- then
- mkdir -p $VERSION_DIR$PACKAGE_CONCEPT_DIR/$package
- cp -R $ROOT_DIR/src/$package$PACKAGE_CONCEPT_DIR/* $VERSION_DIR$PACKAGE_CONCEPT_DIR/$package
- fi
- if [ -d "$ROOT_DIR/src/$package$PACKAGE_DOC_DIR" ]
- then
- mkdir -p $VERSION_DIR$PACKAGE_DOC_DIR/$package
- cp -R $ROOT_DIR/src/$package$PACKAGE_DOC_DIR/* $VERSION_DIR$PACKAGE_DOC_DIR/$package
- fi
- fi
- fi
-done
-
-
-#INSTALL to some directory
-if [ "$TARGET_DIR" != "" ]; then
- echo "Install in dir $TARGET_DIR"
- mv "$VERSION_DIR" "$TARGET_DIR"
-else
- # ZIP DIR AND REMOVE IT
- tar -zcf "$VERSION_DIR.tar.gz" "$VERSION_DIR"
- rm -rf "$VERSION_DIR"
-fi
-
-
-
-
diff --git a/src/Bitmap_cubical_complex/example/CMakeLists.txt b/src/Bitmap_cubical_complex/example/CMakeLists.txt
index 2fddc514..97a45190 100644
--- a/src/Bitmap_cubical_complex/example/CMakeLists.txt
+++ b/src/Bitmap_cubical_complex/example/CMakeLists.txt
@@ -6,8 +6,18 @@ target_link_libraries(Bitmap_cubical_complex ${Boost_SYSTEM_LIBRARY})
if (TBB_FOUND)
target_link_libraries(Bitmap_cubical_complex ${TBB_LIBRARIES})
endif()
-add_test(Bitmap_cubical_complex_one_sphere ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalOneSphere.txt)
-add_test(Bitmap_cubical_complex_two_sphere ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex ${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt)
+
+# Do not forget to copy test files in current binary dir
+file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalOneSphere.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+
+add_test(Bitmap_cubical_complex_one_sphere
+ ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex
+ ${CMAKE_CURRENT_BINARY_DIR}/CubicalOneSphere.txt)
+
+add_test(Bitmap_cubical_complex_two_sphere
+ ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex
+ ${CMAKE_CURRENT_BINARY_DIR}/CubicalTwoSphere.txt)
add_executable ( Random_bitmap_cubical_complex Random_bitmap_cubical_complex.cpp )
target_link_libraries(Random_bitmap_cubical_complex ${Boost_SYSTEM_LIBRARY})
@@ -21,6 +31,15 @@ target_link_libraries(Bitmap_cubical_complex_periodic_boundary_conditions ${Boos
if (TBB_FOUND)
target_link_libraries(Bitmap_cubical_complex_periodic_boundary_conditions ${TBB_LIBRARIES})
endif()
-add_test(Bitmap_cubical_complex_periodic_2d_torus ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex_periodic_boundary_conditions ${CMAKE_SOURCE_DIR}/data/bitmap/2d_torus.txt)
-add_test(Bitmap_cubical_complex_periodic_3d_torus ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex_periodic_boundary_conditions ${CMAKE_SOURCE_DIR}/data/bitmap/3d_torus.txt)
+
+# Do not forget to copy test files in current binary dir
+file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/2d_torus.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/3d_torus.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+
+add_test(Bitmap_cubical_complex_periodic_2d_torus
+ ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex_periodic_boundary_conditions
+ ${CMAKE_CURRENT_BINARY_DIR}/2d_torus.txt)
+add_test(Bitmap_cubical_complex_periodic_3d_torus
+ ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex_periodic_boundary_conditions
+ ${CMAKE_CURRENT_BINARY_DIR}/3d_torus.txt)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c16c9cc..708f3649 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.6)
project(GUDHI)
include("CMakeGUDHIVersion.txt")
-# Generate GUDHI official version file
-configure_file(GUDHIVersion.cmake.in "${CMAKE_SOURCE_DIR}/GUDHIVersion.cmake" @ONLY)
enable_testing()
diff --git a/src/cmake/modules/GUDHI_user_version_target.txt b/src/cmake/modules/GUDHI_user_version_target.txt
index 13fccd32..ca6bcd34 100644
--- a/src/cmake/modules/GUDHI_user_version_target.txt
+++ b/src/cmake/modules/GUDHI_user_version_target.txt
@@ -35,8 +35,6 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11)
copy ${CMAKE_SOURCE_DIR}/src/GUDHIConfig.cmake.in ${GUDHI_USER_VERSION_DIR}/GUDHIConfig.cmake.in)
add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
copy ${CMAKE_SOURCE_DIR}/CMakeGUDHIVersion.txt ${GUDHI_USER_VERSION_DIR}/CMakeGUDHIVersion.txt)
- add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
- copy ${CMAKE_SOURCE_DIR}/GUDHIVersion.cmake.in ${GUDHI_USER_VERSION_DIR}/GUDHIVersion.cmake.in)
add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E
copy_directory ${CMAKE_SOURCE_DIR}/biblio ${GUDHI_USER_VERSION_DIR}/biblio)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 03:48:38 +0000