maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Daniel Malea 2013-03-05 21:59:12 +00:00
parent 83396ba4c9
commit ab5c2012d3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/CMakeLists.txt
View File

@ -143,9 +143,7 @@ macro(add_lldb_library name)
# but it is simple enough to make all of LLDB depend on some of those # but it is simple enough to make all of LLDB depend on some of those
# headers without negatively impacting much of anything. # headers without negatively impacting much of anything.
set (LLDB_DEPENDENCIES set (LLDB_DEPENDENCIES
ClangDiagnosticCommon libclang
#ClangDiagnosticFrontend
#libclang.so
) )
add_dependencies(${name} ${LLDB_DEPENDENCIES}) add_dependencies(${name} ${LLDB_DEPENDENCIES})

8
lldb/source/CMakeLists.txt
View File

@ -125,15 +125,17 @@ set( LLVM_LINK_COMPONENTS
executionengine 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) set(SHARED_LIBRARY 1)
add_lldb_library(liblldb add_lldb_library(liblldb
lldb.cpp lldb.cpp
lldb-log.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) 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 # Determine LLDB revision and repository. GetSourceVersion and GetRepositoryPath are shell-scripts, and as
# such will not work on Windows. # 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 # 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. # 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 install(TARGETS liblldb
LIBRARY DESTINATION lib) LIBRARY DESTINATION lib)

2
lldb/test/CMakeLists.txt
View File

@ -47,5 +47,5 @@ set(LLDB_DOSEP_ARGS
add_python_test_target(check-lldb add_python_test_target(check-lldb
${LLDB_SOURCE_DIR}/test/dosep.ty ${LLDB_SOURCE_DIR}/test/dosep.ty
"${LLDB_DOSEP_ARGS}" "${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)"
) )