diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-07 14:30:09 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-07 14:30:09 +0000 |
| commit | e3707de64413df06f83770a40ed8ba4ad9a69951 (patch) | |
| tree | 2610c747d87638a34623135db3d25b20559b6985 /src/cmake | |
| parent | 4fc6491ae2ee7e02950bf4dc8c027210fb127f76 (diff) | |
Fix user version for gudhi patches
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@1936 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 462555b65b7b3c724a08d11e9b5a2776bf3a1bd8
Diffstat (limited to 'src/cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_user_version_target.txt | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/cmake/modules/GUDHI_user_version_target.txt b/src/cmake/modules/GUDHI_user_version_target.txt index 63301413..c91d5659 100644 --- a/src/cmake/modules/GUDHI_user_version_target.txt +++ b/src/cmake/modules/GUDHI_user_version_target.txt @@ -81,33 +81,18 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.11) endif() endforeach() - # include files - file(GLOB GUDHI_INCLUDE_FILES ${CMAKE_SOURCE_DIR}/src/${GUDHI_MODULE}/include/gudhi/*) + # include files and patches + file(GLOB GUDHI_INCLUDE_FILES ${CMAKE_SOURCE_DIR}/src/${GUDHI_MODULE}/include/*) foreach(GUDHI_INCLUDE_FILE ${GUDHI_INCLUDE_FILES}) get_filename_component(GUDHI_INCLUDE_FILE_NAME ${GUDHI_INCLUDE_FILE} NAME) # GUDHI_INCLUDE_FILE can be a file or a directory if(IS_DIRECTORY ${GUDHI_INCLUDE_FILE}) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - copy_directory ${GUDHI_INCLUDE_FILE} ${GUDHI_USER_VERSION_DIR}/include/gudhi/${GUDHI_INCLUDE_FILE_NAME}) + copy_directory ${GUDHI_INCLUDE_FILE} ${GUDHI_USER_VERSION_DIR}/include/${GUDHI_INCLUDE_FILE_NAME}) else() add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - copy ${GUDHI_INCLUDE_FILE} ${GUDHI_USER_VERSION_DIR}/include/gudhi/${GUDHI_INCLUDE_FILE_NAME}) - endif() - endforeach() - - # Patches - file(GLOB GUDHI_PATCHES_FILES ${CMAKE_SOURCE_DIR}/src/${GUDHI_MODULE}/include/gudhi_patches/*) - - foreach(GUDHI_PATCHES_FILE ${GUDHI_PATCHES_FILES}) - get_filename_component(GUDHI_PATCHES_FILE_NAME ${GUDHI_PATCHES_FILE} NAME) - # GUDHI_PATCHES_FILE can be a file or a directory - if(IS_DIRECTORY ${GUDHI_PATCHES_FILE}) - add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - copy_directory ${GUDHI_PATCHES_FILE} ${GUDHI_USER_VERSION_DIR}/include/gudhi/${GUDHI_PATCHES_FILE_NAME}) - else() - add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - copy ${GUDHI_PATCHES_FILE} ${GUDHI_USER_VERSION_DIR}/include/gudhi/${GUDHI_PATCHES_FILE_NAME}) + copy ${GUDHI_INCLUDE_FILE} ${GUDHI_USER_VERSION_DIR}/include/${GUDHI_INCLUDE_FILE_NAME}) endif() endforeach() |