summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-05-13 16:12:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-05-13 16:12:28 (GMT)
commitb07bc05961166170c352163d95f96c0cb80cdae1 (patch)
tree1e8c829bc1fbfa32593d0d2f2f2555d6155b59de /Modules
parent44ae68d976ecd1ac721967a2fde241e24f2d7d12 (diff)
parent0199dd9f1b48b47ae63547ffe737ea9169caf511 (diff)
downloadCMake-b07bc05961166170c352163d95f96c0cb80cdae1.zip
CMake-b07bc05961166170c352163d95f96c0cb80cdae1.tar.gz
CMake-b07bc05961166170c352163d95f96c0cb80cdae1.tar.bz2
Merge topic 'fix-cache-args-file-to-dep-list' into release-3.17
0199dd9f1b ExternalProject: expose _ep_cache_args_script to the caller Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4710
Diffstat (limited to 'Modules')
-rw-r--r--Modules/ExternalProject.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index a9448e5..12a91b3 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -2974,6 +2974,10 @@ function(_ep_extract_configure_command var name)
endif()
_ep_write_initial_cache(${name} "${_ep_cache_args_script}" "${script_initial_cache_force}${script_initial_cache_default}")
list(APPEND cmd "-C${_ep_cache_args_script}")
+ _ep_replace_location_tags(${name} _ep_cache_args_script)
+ set(_ep_cache_args_script
+ "${_ep_cache_args_script}"
+ PARENT_SCOPE)
endif()
list(APPEND cmd "<SOURCE_DIR><SOURCE_SUBDIR>")