diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-23 09:16:03 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-03-23 09:16:03 +0000 |
| commit | 8a0a20484e968b872b911ca964b079442c6c1fe7 (patch) | |
| tree | d453db6d031e782e03cbb48a37c16388ecc1cd2d /src/cmake/modules | |
| parent | ccffd3d0e3d27255533b8bd6d51aa5b4210feb90 (diff) | |
| parent | f0e209149a6bf1d3b13572f3704986a429130a48 (diff) | |
Merge ST_cythonize branch into the trunk
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2225 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 013d700aaa4b255cc91ff79020b40b7e6c4e7d05
Diffstat (limited to 'src/cmake/modules')
| -rw-r--r-- | src/cmake/modules/FindGMPXX.cmake | 4 | ||||
| -rw-r--r-- | src/cmake/modules/GUDHI_user_version_target.txt | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/cmake/modules/FindGMPXX.cmake b/src/cmake/modules/FindGMPXX.cmake index 277e4b19..dda302c0 100644 --- a/src/cmake/modules/FindGMPXX.cmake +++ b/src/cmake/modules/FindGMPXX.cmake @@ -33,6 +33,10 @@ if(GMP_FOUND) DOC "Path to the GMPXX library" ) + if ( GMPXX_LIBRARIES ) + get_filename_component(GMPXX_LIBRARIES_DIR ${GMPXX_LIBRARIES} PATH CACHE ) + endif() + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(GMPXX "DEFAULT_MSG" GMPXX_LIBRARIES GMPXX_INCLUDE_DIR ) diff --git a/src/cmake/modules/GUDHI_user_version_target.txt b/src/cmake/modules/GUDHI_user_version_target.txt index 0d05b8f2..13fccd32 100644 --- a/src/cmake/modules/GUDHI_user_version_target.txt +++ b/src/cmake/modules/GUDHI_user_version_target.txt @@ -41,6 +41,8 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/biblio ${GUDHI_USER_VERSION_DIR}/biblio) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E + copy_directory ${CMAKE_SOURCE_DIR}/src/cython ${GUDHI_USER_VERSION_DIR}/cython) + add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/data ${GUDHI_USER_VERSION_DIR}/data) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/cmake ${GUDHI_USER_VERSION_DIR}/cmake) |