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
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@176517 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 859dc80..f144fe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,9 +143,7 @@
# 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/source/CMakeLists.txt b/source/CMakeLists.txt
index 5add358..5855035 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -125,15 +125,17 @@
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 @@
# 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/test/CMakeLists.txt b/test/CMakeLists.txt
index 8464809..fd2b0a0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -47,5 +47,5 @@
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)"
)