diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
| commit | 0ce82cdc262fe9c09a1df1f559e1c17abfbbea3d (patch) | |
| tree | 56fcdcce7544a32899d0707c2274274df2c37d30 /src/cmake/modules/GUDHI_user_version_target.cmake | |
| parent | 7cd38c50d3843fd222d4210507bad948afe63912 (diff) | |
| parent | 5d5f40493ce60f2a606793645bf713c60fb5284d (diff) | |
Merge upstream and resolve conflict
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, 0 insertions, 2 deletions
diff --git a/src/cmake/modules/GUDHI_user_version_target.cmake b/src/cmake/modules/GUDHI_user_version_target.cmake index 4fa74330..0b361a0f 100644 --- a/src/cmake/modules/GUDHI_user_version_target.cmake +++ b/src/cmake/modules/GUDHI_user_version_target.cmake @@ -33,8 +33,6 @@ add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/biblio ${GUDHI_USER_VERSION_DIR}/biblio) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E - copy ${CMAKE_SOURCE_DIR}/Conventions.txt ${GUDHI_USER_VERSION_DIR}/Conventions.txt) -add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/README.md ${GUDHI_USER_VERSION_DIR}/README.md) add_custom_command(TARGET user_version PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/LICENSE ${GUDHI_USER_VERSION_DIR}/LICENSE) |