diff options
author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-06 15:33:33 +0000 |
---|---|---|
committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-06 15:33:33 +0000 |
commit | 5f62ba7ffa4322a16c811f59fbf206a3b41ff7f7 (patch) | |
tree | 5c8530e3e2f5c3aba3480685b05dda8e0d82fffb /src/CMakeLists.txt | |
parent | 66e70c2cecefb3e83db9c6431b7a231a9893ed3b (diff) |
Cmake fixes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@834 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: b11aad4d7984b2f156fac8df298516c7780b0df4
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e8297aa8..010bd995 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -39,29 +39,6 @@ else() LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) #--------------------------------------------------------------------------------------- - # GUDHIConfig.cmake 1st part - - # Offer the user the choice of overriding the installation directories - i.e. "cmake -DGUDHI_DIR=~/gudhi/GUDHI_1.2.0 ." - set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries") - set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables") - set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") - if(WIN32 AND NOT CYGWIN) - set(DEF_INSTALL_CMAKE_DIR CMake) - else() - set(DEF_INSTALL_CMAKE_DIR lib/CMake/GUDHI) - endif() - set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") - - # Make relative paths absolute (needed later on) - foreach(p LIB BIN INCLUDE CMAKE) - set(var INSTALL_${p}_DIR) - if(NOT IS_ABSOLUTE "${${var}}") - set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") - endif() - endforeach() - #--------------------------------------------------------------------------------------- - - #--------------------------------------------------------------------------------------- # Gudhi compilation part include_directories(include) @@ -80,33 +57,26 @@ else() #--------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------- - # GUDHIConfig.cmake 2nd part + # 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 - file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") - # ... for the build tree - set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") + set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include") configure_file(GUDHIConfig.cmake.in "${PROJECT_BINARY_DIR}/GUDHIConfig.cmake" @ONLY) - # ... for the install tree - set(CONF_INCLUDE_DIRS "\${GUDHI_CMAKE_DIR}/${REL_INCLUDE_DIR}") - configure_file(GUDHIConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/GUDHIConfig.cmake" @ONLY) - # ... for both configure_file(GUDHIConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/GUDHIConfigVersion.cmake" @ONLY) - configure_file(GUDHIVersion.cmake.in "${PROJECT_BINARY_DIR}/GUDHIVersion.cmake" @ONLY) + #--------------------------------------------------------------------------------------- + + #--------------------------------------------------------------------------------------- + # Gudhi installation part # Install the GUDHIConfig.cmake and GUDHIConfigVersion.cmake install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/GUDHIConfig.cmake" "${PROJECT_BINARY_DIR}/GUDHIConfigVersion.cmake" - DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) - #--------------------------------------------------------------------------------------- - - #--------------------------------------------------------------------------------------- - # Gudhi installation part + DESTINATION share/gudhi) # install the include file on "make install" install(DIRECTORY include/gudhi DESTINATION include) |