[llvm] r319089 - Use LIST_SEPARATOR rather than escaping in ExternalProject_Add

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Mon Nov 27 12:41:53 PST 2017


Author: phosek
Date: Mon Nov 27 12:41:53 2017
New Revision: 319089

URL: http://llvm.org/viewvc/llvm-project?rev=319089&view=rev
Log:
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

Modified:
    llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake

Modified: llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake?rev=319089&r1=319088&r2=319089&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake (original)
+++ llvm/trunk/cmake/modules/LLVMExternalProjectUtils.cmake Mon Nov 27 12:41:53 2017
@@ -95,7 +95,7 @@ function(llvm_ExternalProject_Add name s
   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 s
     USES_TERMINAL_CONFIGURE 1
     USES_TERMINAL_BUILD 1
     USES_TERMINAL_INSTALL 1
+    LIST_SEPARATOR ,
     )
 
   if(ARG_USE_TOOLCHAIN)




More information about the llvm-commits mailing list