diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-12 17:37:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-12 17:37:54 (GMT) |
| commit | 23fb573c5f8d49bcf748cc8d30bce94dfeb5b2e6 (patch) | |
| tree | d06a4d0a6d7dbf8676362f0c5df085595a7415fd | |
| parent | 0d5a2252ef8a586f4fc70a66aabd17fb3fd52110 (diff) | |
| parent | 627422d9de2de41c90d4168b5ff97a074e7232ae (diff) | |
| download | CMake-23fb573c5f8d49bcf748cc8d30bce94dfeb5b2e6.zip CMake-23fb573c5f8d49bcf748cc8d30bce94dfeb5b2e6.tar.gz CMake-23fb573c5f8d49bcf748cc8d30bce94dfeb5b2e6.tar.bz2 | |
Merge branch 'backport-ep-log-no-extract-fix' into release-3.8
| -rw-r--r-- | Modules/ExternalProject.cmake | 5 | ||||
| -rw-r--r-- | Tests/ExternalProject/CMakeLists.txt | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index b42d2dd..34dc98c 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1990,11 +1990,10 @@ function(_ep_add_download_command name) set(comment "Performing download step (${steps}) for '${name}'") _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}") endif() - list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake - COMMAND) + list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake) if (NOT no_extract) _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}") - list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake) + list(APPEND cmd COMMAND ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake) else () set_property(TARGET ${name} PROPERTY _EP_DOWNLOADED_FILE ${file}) endif () diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt index 72c20eb..6b73563 100644 --- a/Tests/ExternalProject/CMakeLists.txt +++ b/Tests/ExternalProject/CMakeLists.txt @@ -90,6 +90,16 @@ ExternalProject_Add(${proj} ) set_property(TARGET ${proj} PROPERTY FOLDER "") +set(proj NoExtractLogDownload) +ExternalProject_Add(${proj} + URL ${CMAKE_CURRENT_SOURCE_DIR}/gitrepo.tgz + DOWNLOAD_NO_EXTRACT 1 + LOG_DOWNLOAD 1 + BUILD_COMMAND "" + CONFIGURE_COMMAND "" + INSTALL_COMMAND "" +) + # CVS-based tests: # |