mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-03 20:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

ExternalProject: allow DOWNLOAD_NO_EXTRACT OFF

Browse Source 
Fixes: #20531
This commit is contained in:
Ben Boeckel
2020-04-02 08:49:21 -04:00
parent e3185e3d1b
commit 2c4bb705e8
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/ExternalProject.cmake
View File

@@ -2595,7 +2595,7 @@ function(_ep_add_download_command name)
set(cmd ${CMAKE_COMMAND} -E rm -rf ${source_dir} set(cmd ${CMAKE_COMMAND} -E rm -rf ${source_dir}
COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir}) COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir})
else() 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]+://") if("${url}" MATCHES "^[a-z]+://")
# TODO: Should download and extraction be different steps? # TODO: Should download and extraction be different steps?
if("x${fname}" STREQUAL "x") if("x${fname}" STREQUAL "x")

9
Tests/ExternalProject/CMakeLists.txt
View File

@@ -100,6 +100,15 @@ ExternalProject_Add(${proj}
INSTALL_COMMAND "" 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: # CVS-based tests:
# #