diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-03 10:58:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-03 10:58:22 (GMT) |
| commit | 11998c63fd9be2fe64ec05c2ba0bce22ca8cf140 (patch) | |
| tree | 6d41ee6992db984090639c4c4f0b7ac12cf676a3 | |
| parent | a554827983ac70ecda805bfe97dbd9df2f7f6312 (diff) | |
| parent | 2c4bb705e842db66904df5014a5755b57ac51b72 (diff) | |
| download | CMake-11998c63fd9be2fe64ec05c2ba0bce22ca8cf140.zip CMake-11998c63fd9be2fe64ec05c2ba0bce22ca8cf140.tar.gz CMake-11998c63fd9be2fe64ec05c2ba0bce22ca8cf140.tar.bz2 | |
Merge topic 'ExternalProject-no-extract-bool' into release-3.17
2c4bb705e8 ExternalProject: allow `DOWNLOAD_NO_EXTRACT OFF`
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4562
| -rw-r--r-- | Modules/ExternalProject.cmake | 2 | ||||
| -rw-r--r-- | Tests/ExternalProject/CMakeLists.txt | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 5bac0d8..a9448e5 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -2595,7 +2595,7 @@ function(_ep_add_download_command name) set(cmd ${CMAKE_COMMAND} -E rm -rf ${source_dir} COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir}) else() - get_property(no_extract TARGET "${name}" PROPERTY _EP_DOWNLOAD_NO_EXTRACT SET) + get_property(no_extract TARGET "${name}" PROPERTY _EP_DOWNLOAD_NO_EXTRACT) if("${url}" MATCHES "^[a-z]+://") # TODO: Should download and extraction be different steps? if("x${fname}" STREQUAL "x") diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt index 450e7e5..c8850ea 100644 --- a/Tests/ExternalProject/CMakeLists.txt +++ b/Tests/ExternalProject/CMakeLists.txt @@ -100,6 +100,15 @@ ExternalProject_Add(${proj} INSTALL_COMMAND "" ) +set(proj NoExtractBool) +ExternalProject_Add(${proj} + URL ${CMAKE_CURRENT_SOURCE_DIR}/gitrepo.tgz + DOWNLOAD_NO_EXTRACT 0 + LOG_DOWNLOAD 1 + BUILD_COMMAND "" + CONFIGURE_COMMAND "" + INSTALL_COMMAND "" +) # CVS-based tests: # |