Merged with trunk and removed unnecessary files

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

Former-commit-id: d0ec52d222d22c102e9fe57590882cd0024c82d5

1 files changed, 41 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70fc9a45..864ee040 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
 project(GUDHI)
 
+include("CMakeGUDHIVersion.txt")
+
+enable_testing()
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
 
 find_package(Boost REQUIRED COMPONENTS system filesystem program_options chrono timer REQUIRED)
 
-
 if (NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE "Release")
 endif()
@@ -19,7 +22,6 @@ set(Boost_USE_STATIC_LIBS        ON)
 set(Boost_USE_MULTITHREADED      ON)
 set(Boost_USE_STATIC_RUNTIME    OFF)
 
-find_package(Boost)
 find_package(GMP)
 if(GMP_FOUND)
   find_package(GMPXX)
@@ -36,22 +38,53 @@ else()
   add_definitions(-DBOOST_ALL_NO_LIB)
 
   INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-  LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})                      
-  include_directories(include/)
-	
+  LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+
+  #---------------------------------------------------------------------------------------
+  # 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/Hasse_complex)
   add_subdirectort(example/Witness_complex)
-  add_subdirectory(example/Alpha_shapes)
+  # add_subdirectory(example/Alpha_shapes)
   add_subdirectory(example/Bottleneck)
 
+  # 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(GudhUI)
+  #---------------------------------------------------------------------------------------
 
-  # data points generator
-  add_subdirectory(data/points/generator)
+  #---------------------------------------------------------------------------------------
+  # GUDHIConfig.cmake
+  # Export the package for use from the build-tree
+  # (this registers the build-tree with a global CMake-registry)
+  export(PACKAGE GUDHI)
+
+  # Create the GUDHIConfig.cmake and GUDHIConfigVersion files
+  set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include")
+  configure_file(GUDHIConfig.cmake.in "${PROJECT_BINARY_DIR}/GUDHIConfig.cmake" @ONLY)
+  configure_file(GUDHIConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/GUDHIConfigVersion.cmake" @ONLY)
+
+  #---------------------------------------------------------------------------------------
+
+  #---------------------------------------------------------------------------------------
+  # Gudhi installation part
+
+  # Install the GUDHIConfig.cmake and GUDHIConfigVersion.cmake
+  install(FILES
+    "${PROJECT_BINARY_DIR}/GUDHIConfig.cmake"
+    "${PROJECT_BINARY_DIR}/GUDHIConfigVersion.cmake"
+    DESTINATION share/gudhi)
+
+  # install the include file on "make install"
+  install(DIRECTORY include/gudhi DESTINATION include)
+  #---------------------------------------------------------------------------------------
 
 endif()