diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-21 16:03:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-21 16:04:03 (GMT) |
| commit | d2f859f1510c334403b948481f78e56731a29eac (patch) | |
| tree | e969e885d52cd9c0f60cf5bfb924be7f406787c8 | |
| parent | ae7d99fbd51e31e012f1434ebe7ba16ea1bef060 (diff) | |
| parent | 46de38dae2c43c0dc2dd24307a0615a11a881e39 (diff) | |
| download | CMake-d2f859f1510c334403b948481f78e56731a29eac.zip CMake-d2f859f1510c334403b948481f78e56731a29eac.tar.gz CMake-d2f859f1510c334403b948481f78e56731a29eac.tar.bz2 | |
Merge topic 'ExternalProject-list-sep-in-cache'
46de38dae2 ExternalProject: replace LIST_SEPARATOR in initial cache files too
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4070
| -rw-r--r-- | Modules/ExternalProject.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 1e54266..db3716a 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1777,6 +1777,11 @@ function(_ep_write_initial_cache target_name script_filename script_initial_cach # Replace location tags. _ep_replace_location_tags(${target_name} script_initial_cache) _ep_replace_location_tags(${target_name} script_filename) + # Replace list separators. + get_property(sep TARGET ${target_name} PROPERTY _EP_LIST_SEPARATOR) + if(sep AND script_initial_cache) + string(REPLACE "${sep}" ";" script_initial_cache "${script_initial_cache}") + endif() # Write out the initial cache file to the location specified. file(GENERATE OUTPUT "${script_filename}" CONTENT "${script_initial_cache}") endfunction() |