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

llvm-svn: 176517

3 files changed, 6 insertions, 8 deletions

diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 859dc80d70b..f144fe21216 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -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})

 

diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt
index 5add358a990..5855035e617 100644
--- a/lldb/source/CMakeLists.txt
+++ b/lldb/source/CMakeLists.txt
@@ -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)

diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
index 84648093e68..fd2b0a0e599 100644
--- a/lldb/test/CMakeLists.txt
+++ b/lldb/test/CMakeLists.txt
@@ -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)"
   )