summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2017-11-29 21:32:26 (GMT)
committerCraig Scott <craig.scott@crascit.com>2017-12-06 20:22:02 (GMT)
commitb8b87489770bd29ffcfc4b2faec3f98bd089f3ff (patch)
tree661f6bf94c784e92ac610febe9ec7e6331192cc4 /Modules
parentb311b8751819ec881824c61ef8de03387ff40c3f (diff)
downloadCMake-b8b87489770bd29ffcfc4b2faec3f98bd089f3ff.zip
CMake-b8b87489770bd29ffcfc4b2faec3f98bd089f3ff.tar.gz
CMake-b8b87489770bd29ffcfc4b2faec3f98bd089f3ff.tar.bz2
ExternalProject: Support substituting <DOWNLOAD_DIR>
Diffstat (limited to 'Modules')
-rw-r--r--Modules/ExternalProject.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 67aac4f..d284e27 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -714,8 +714,9 @@ control needed to implement such step-level capabilities.
The command line, comment, working directory and byproducts of every
standard and custom step are processed to replace the tokens
``<SOURCE_DIR>``, ``<SOURCE_SUBDIR>``, ``<BINARY_DIR>``, ``<INSTALL_DIR>``
- and ``<TMP_DIR>`` with their corresponding property values defined in the
- original call to :command:`ExternalProject_Add`.
+ ``<TMP_DIR>``, ``<DOWNLOAD_DIR>`` and ``<DOWNLOADED_FILE>`` with their
+ corresponding property values defined in the original call to
+ :command:`ExternalProject_Add`.
.. command:: ExternalProject_Add_StepTargets
@@ -1665,7 +1666,7 @@ macro(_ep_replace_location_tags target_name)
set(vars ${ARGN})
foreach(var ${vars})
if(${var})
- foreach(dir SOURCE_DIR SOURCE_SUBDIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOADED_FILE)
+ foreach(dir SOURCE_DIR SOURCE_SUBDIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOAD_DIR DOWNLOADED_FILE)
get_property(val TARGET ${target_name} PROPERTY _EP_${dir})
string(REPLACE "<${dir}>" "${val}" ${var} "${${var}}")
endforeach()