diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 10:25:27 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 10:25:27 +0100 |
| commit | bb6f10aff11e05baec2d2d10c544a2ea1c302bc6 (patch) | |
| tree | 665b6fcbdf6c951d31206852a2d356ef103ada18 /src/cmake/modules/GUDHI_user_version_target.cmake | |
| parent | f78d65f0bd6aaf5f92639e2b809e1711acf929f7 (diff) | |
| parent | 2ec0ac1f006577d520accbe605a61fc10ede3352 (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'src/cmake/modules/GUDHI_user_version_target.cmake')
| -rw-r--r-- | src/cmake/modules/GUDHI_user_version_target.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake index 5047252f..257d1939 100644 --- a/src/cmake/modules/GUDHI_user_version_target.cmake +++ b/src/cmake/modules/GUDHI_user_version_target.cmake @@ -55,7 +55,7 @@ add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/GudhUI ${GUDHI_USER_VERSION_DIR}/GudhUI) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - copy_directory ${CMAKE_SOURCE_DIR}/ext/hera/geom_matching/wasserstein/include ${GUDHI_USER_VERSION_DIR}/ext/hera/geom_matching/wasserstein/include) + copy_directory ${CMAKE_SOURCE_DIR}/ext/hera/wasserstein/include ${GUDHI_USER_VERSION_DIR}/ext/hera/wasserstein/include) set(GUDHI_DIRECTORIES "doc;example;concept;utilities") |