diff options
| author | Daniel Malea <daniel.malea@intel.com> | 2013-05-15 17:23:19 +0000 |
|---|---|---|
| committer | Daniel Malea <daniel.malea@intel.com> | 2013-05-15 17:23:19 +0000 |
| commit | e3a0a6ec919f3e549a949d32364edd47c20a371f (patch) | |
| tree | 5158c23f2b29102914607aa382d4101bdb75b1f5 | |
| parent | 72ddaba785deb55816657ff065e0239fd4b1b4df (diff) | |
| download | bcm5719-llvm-e3a0a6ec919f3e549a949d32364edd47c20a371f.tar.gz bcm5719-llvm-e3a0a6ec919f3e549a949d32364edd47c20a371f.zip | |
Fix cmake builds from checkouts with multiple remotes
- newlines from GetRepositoryPath output were interfering with ninja builds
- replace newlines with spaces
- remove *only* trailing spaces from repo path
llvm-svn: 181899
| -rw-r--r-- | lldb/source/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt index eb917e1f6a8..10bf48a18fd 100644 --- a/lldb/source/CMakeLists.txt +++ b/lldb/source/CMakeLists.txt @@ -160,8 +160,11 @@ if ( NOT CMAKE_SYSTEM_NAME MATCHES "Windows" ) execute_process(COMMAND ${CMAKE_SOURCE_DIR}/utils/GetRepositoryPath ${LLDB_SOURCE_DIR}
OUTPUT_VARIABLE LLDB_REPOSITORY)
if ( LLDB_REPOSITORY )
- string(REGEX REPLACE "(\r?\n)+$" "" LLDB_REPOSITORY ${LLDB_REPOSITORY})
- string(REPLACE " " "" LLDB_REPOSITORY ${LLDB_REPOSITORY})
+ # Replace newline characters with spaces
+ string(REGEX REPLACE "(\r?\n)+" " " LLDB_REPOSITORY ${LLDB_REPOSITORY})
+
+ # Remove trailing spaces
+ string(REGEX REPLACE "(\ )+$" "" LLDB_REPOSITORY ${LLDB_REPOSITORY})
endif()
set_property(
|
