[PATCH] D40257: [CMake] Use LIST_SEPARATOR rather than escaping in ExternalProject_Add
This revision was automatically updated to reflect the committed changes. Closed by commit rL319264: [CMake] Use LIST_SEPARATOR rather than escaping in ExternalProject_Add (authored by phosek). Changed prior to commit: https://reviews.llvm.org/D40257?vs=123710=124663#toc Repository: rL LLVM https://reviews.llvm.org/D40257 Files: cfe/trunk/CMakeLists.txt Index: cfe/trunk/CMakeLists.txt === --- cfe/trunk/CMakeLists.txt +++ cfe/trunk/CMakeLists.txt @@ -653,7 +653,7 @@ foreach(variableName ${variableNames}) if(variableName MATCHES "^BOOTSTRAP_") string(SUBSTRING ${variableName} 10 -1 varName) - string(REPLACE ";" "\;" value "${${variableName}}") + string(REPLACE ";" "," value "${${variableName}}") list(APPEND PASSTHROUGH_VARIABLES -D${varName}=${value}) endif() @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value "${${variableName}}") endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target Index: cfe/trunk/CMakeLists.txt === --- cfe/trunk/CMakeLists.txt +++ cfe/trunk/CMakeLists.txt @@ -653,7 +653,7 @@ foreach(variableName ${variableNames}) if(variableName MATCHES "^BOOTSTRAP_") string(SUBSTRING ${variableName} 10 -1 varName) - string(REPLACE ";" "\;" value "${${variableName}}") + string(REPLACE ";" "," value "${${variableName}}") list(APPEND PASSTHROUGH_VARIABLES -D${varName}=${value}) endif() @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value "${${variableName}}") endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D40257: [CMake] Use LIST_SEPARATOR rather than escaping in ExternalProject_Add
beanz accepted this revision. beanz added a comment. This revision is now accepted and ready to land. LGTM! Repository: rL LLVM https://reviews.llvm.org/D40257 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D40257: [CMake] Use LIST_SEPARATOR rather than escaping in ExternalProject_Add
phosek added a comment. Can you please take a look at this one as well (this one is Clang, the other one was LLVM)? Repository: rL LLVM https://reviews.llvm.org/D40257 ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D40257: [CMake] Use LIST_SEPARATOR rather than escaping in ExternalProject_Add
phosek updated this revision to Diff 123710. Repository: rL LLVM https://reviews.llvm.org/D40257 Files: CMakeLists.txt Index: CMakeLists.txt === --- CMakeLists.txt +++ CMakeLists.txt @@ -653,7 +653,7 @@ foreach(variableName ${variableNames}) if(variableName MATCHES "^BOOTSTRAP_") string(SUBSTRING ${variableName} 10 -1 varName) - string(REPLACE ";" "\;" value "${${variableName}}") + string(REPLACE ";" "," value "${${variableName}}") list(APPEND PASSTHROUGH_VARIABLES -D${varName}=${value}) endif() @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value "${${variableName}}") endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target Index: CMakeLists.txt === --- CMakeLists.txt +++ CMakeLists.txt @@ -653,7 +653,7 @@ foreach(variableName ${variableNames}) if(variableName MATCHES "^BOOTSTRAP_") string(SUBSTRING ${variableName} 10 -1 varName) - string(REPLACE ";" "\;" value "${${variableName}}") + string(REPLACE ";" "," value "${${variableName}}") list(APPEND PASSTHROUGH_VARIABLES -D${varName}=${value}) endif() @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value "${${variableName}}") endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D40257: [CMake] Use LIST_SEPARATOR rather than escaping in ExternalProject_Add
phosek updated this revision to Diff 123640. Repository: rL LLVM https://reviews.llvm.org/D40257 Files: CMakeLists.txt Index: CMakeLists.txt === --- CMakeLists.txt +++ CMakeLists.txt @@ -653,7 +653,7 @@ foreach(variableName ${variableNames}) if(variableName MATCHES "^BOOTSTRAP_") string(SUBSTRING ${variableName} 10 -1 varName) - string(REPLACE ";" "\;" value "${${variableName}}") + string(REPLACE ";" "," value "${${variableName}}") list(APPEND PASSTHROUGH_VARIABLES -D${varName}=${value}) endif() @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value ${${variableName}}) endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target Index: CMakeLists.txt === --- CMakeLists.txt +++ CMakeLists.txt @@ -653,7 +653,7 @@ foreach(variableName ${variableNames}) if(variableName MATCHES "^BOOTSTRAP_") string(SUBSTRING ${variableName} 10 -1 varName) - string(REPLACE ";" "\;" value "${${variableName}}") + string(REPLACE ";" "," value "${${variableName}}") list(APPEND PASSTHROUGH_VARIABLES -D${varName}=${value}) endif() @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value ${${variableName}}) endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D40257: [CMake] Use LIST_SEPARATOR rather than escaping in ExternalProject_Add
phosek created this revision. Herald added a subscriber: mgorny. 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. Repository: rL LLVM https://reviews.llvm.org/D40257 Files: CMakeLists.txt Index: CMakeLists.txt === --- CMakeLists.txt +++ CMakeLists.txt @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value ${${variableName}}) endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target Index: CMakeLists.txt === --- CMakeLists.txt +++ CMakeLists.txt @@ -669,7 +669,7 @@ if("${${variableName}}" STREQUAL "") set(value "") else() -string(REPLACE ";" "\;" value ${${variableName}}) +string(REPLACE ";" "," value ${${variableName}}) endif() list(APPEND PASSTHROUGH_VARIABLES -D${variableName}=${value}) @@ -697,6 +697,7 @@ USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1 USES_TERMINAL_INSTALL 1 +LIST_SEPARATOR , ) # exclude really-install from main target ___ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits