diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-11-27 20:41:53 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-11-27 20:41:53 +0000 |
| commit | aa56864bc35c6288e5d3f8e4861a68d061580bd5 (patch) | |
| tree | 8191a8a4f4d822d62a17938f5c07efd56686ec3d /cmake | |
| parent | 63c8163add367ed3226777b6267ff57193bbb833 (diff) | |
Use LIST_SEPARATOR rather than escaping in ExternalProject_Add
Escaping ; in list arguments passed to ExternalProject_Add doesn't seem
to be working in newer versions of CMake (see
https://public.kitware.com/Bug/view.php?id=16137 for more details). Use
a custom LIST_SEPARATOR instead which is the officially supported way.
Differential Revision: https://reviews.llvm.org/D40232
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319089 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/LLVMExternalProjectUtils.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/modules/LLVMExternalProjectUtils.cmake b/cmake/modules/LLVMExternalProjectUtils.cmake index c9e9b652ca4..90a91512321 100644 --- a/cmake/modules/LLVMExternalProjectUtils.cmake +++ b/cmake/modules/LLVMExternalProjectUtils.cmake @@ -95,7 +95,7 @@ function(llvm_ExternalProject_Add name source_dir) foreach(prefix ${ARG_PASSTHROUGH_PREFIXES}) foreach(variableName ${variableNames}) if(variableName MATCHES "^${prefix}") - string(REPLACE ";" "\;" value "${${variableName}}") + string(REPLACE ";" "," value "${${variableName}}") list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) endif() @@ -159,6 +159,7 @@ function(llvm_ExternalProject_Add name source_dir) USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 + LIST_SEPARATOR , ) if(ARG_USE_TOOLCHAIN) |