[Lldb-commits] [lldb] r176517 - Fix Ninja LLDB build on Linux (via cmake -G Ninja)

[Daniel Malea]

Author: dmalea
Date: Tue Mar  5 15:59:12 2013
New Revision: 176517

URL: http://llvm.org/viewvc/llvm-project?rev=176517&view=rev
Log:
Fix Ninja LLDB build on Linux (via cmake -G Ninja)
- resolved circular dependency issue by making liblldb depend directly on LLDBWrapPython.cpp
- removed use of '..' for relative directories -- ninja doesn't like this
- fixed build-order problem


Modified:
    lldb/trunk/CMakeLists.txt
    lldb/trunk/source/CMakeLists.txt
    lldb/trunk/test/CMakeLists.txt

Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=176517&r1=176516&r2=176517&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Tue Mar  5 15:59:12 2013
@@ -143,9 +143,7 @@ macro(add_lldb_library name)
   # but it is simple enough to make all of LLDB depend on some of those
   # headers without negatively impacting much of anything.
   set (LLDB_DEPENDENCIES
-    ClangDiagnosticCommon
-    #ClangDiagnosticFrontend
-    #libclang.so
+    libclang
     )
   add_dependencies(${name} ${LLDB_DEPENDENCIES})
 

Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=176517&r1=176516&r2=176517&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Tue Mar  5 15:59:12 2013
@@ -125,15 +125,17 @@ set( LLVM_LINK_COMPONENTS
   executionengine
   )
 
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/../scripts/LLDBWrapPython.cpp PROPERTIES GENERATED 1)
+set_source_files_properties(${LLDB_BINARY_DIR}/scripts/LLDBWrapPython.cpp PROPERTIES GENERATED 1)
 set(SHARED_LIBRARY 1)
 
 add_lldb_library(liblldb
   lldb.cpp
   lldb-log.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/../scripts/LLDBWrapPython.cpp
+  ${LLDB_BINARY_DIR}/scripts/LLDBWrapPython.cpp
   )
 set_target_properties(liblldb PROPERTIES OUTPUT_NAME lldb)
+add_dependencies(liblldb ${LLDB_BINARY_DIR}/scripts/LLDBWrapPython.cpp)
+target_link_libraries(liblldb ${LLDB_SYSTEM_LIBS})
 
 # Determine LLDB revision and repository. GetSourceVersion and GetRepositoryPath are shell-scripts, and as
 # such will not work on Windows.
@@ -154,8 +156,6 @@ endif ()
 # FIXME: implement svn/git revision and repository parsing solution on Windows. There is an SVN-only
 #        revision parsing solution in tools/clang/lib/Basic/CMakelists.txt.
 
-target_link_libraries(liblldb ${LLDB_SYSTEM_LIBS})
-add_dependencies(liblldb swig_wrapper)
 
 install(TARGETS liblldb
   LIBRARY DESTINATION lib)

Modified: lldb/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/CMakeLists.txt?rev=176517&r1=176516&r2=176517&view=diff
==============================================================================
--- lldb/trunk/test/CMakeLists.txt (original)
+++ lldb/trunk/test/CMakeLists.txt Tue Mar  5 15:59:12 2013
@@ -47,5 +47,5 @@ set(LLDB_DOSEP_ARGS
 add_python_test_target(check-lldb
   ${LLDB_SOURCE_DIR}/test/dosep.ty
   "${LLDB_DOSEP_ARGS}"
-  "Testing LLDB (with a separate subprocess per test) with args: ${LLDB_COMMON_TEST_ARGS};${LLDB_TEST_ARGS}"
+  "Testing LLDB (with a separate subprocess per test)"
   )