[Lldb-commits] [lldb] r181899 - Fix cmake builds from checkouts with multiple remotes

[Daniel Malea]

Author: dmalea
Date: Wed May 15 12:23:19 2013
New Revision: 181899

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


Modified:
    lldb/trunk/source/CMakeLists.txt

Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=181899&r1=181898&r2=181899&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Wed May 15 12:23:19 2013
@@ -160,8 +160,11 @@ if ( NOT CMAKE_SYSTEM_NAME MATCHES "Wind
   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(