diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-07 13:14:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-07 13:14:34 (GMT) |
| commit | e1a09cfbd1d1802b5fc4ae9b4918bb00ce468dcc (patch) | |
| tree | 4c491fc06b058ce7c34b151eacf472fcc2c47a3b /Modules | |
| parent | 79fde6a324545f6461020c957af1f63e5f2a72da (diff) | |
| parent | b8b87489770bd29ffcfc4b2faec3f98bd089f3ff (diff) | |
| download | CMake-e1a09cfbd1d1802b5fc4ae9b4918bb00ce468dcc.zip CMake-e1a09cfbd1d1802b5fc4ae9b4918bb00ce468dcc.tar.gz CMake-e1a09cfbd1d1802b5fc4ae9b4918bb00ce468dcc.tar.bz2 | |
Merge topic 'externalproject_download_dir'
b8b87489 ExternalProject: Support substituting <DOWNLOAD_DIR>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1537
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 7 |
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() |