diff options
| author | Alex Langford <apl@fb.com> | 2018-06-18 18:27:16 +0000 |
|---|---|---|
| committer | Alex Langford <apl@fb.com> | 2018-06-18 18:27:16 +0000 |
| commit | 27510c18ad5ae0b476e06039d3ad49c6500c49bd (patch) | |
| tree | 61590340c65c6e75c8f47b85520ffbc579ec7024 /lldb/tools | |
| parent | 68c9b8d6a181934636d39c36e020d5999b2c67ad (diff) | |
| download | bcm5719-llvm-27510c18ad5ae0b476e06039d3ad49c6500c49bd.tar.gz bcm5719-llvm-27510c18ad5ae0b476e06039d3ad49c6500c49bd.zip | |
Introduce lldb-framework CMake target and centralize its logic
Summary:
In this patch I aim to do the following:
1) Create an lldb-framework target that acts as the target that handles generating LLDB.framework. Previously, liblldb acted as the target for generating the framework in addition to generating the actual lldb library. This made the target feel overloaded.
2) Centralize framework generation as much as it makes sense to do so.
3) Create a target lldb-suite, which depends on every tool and library that makes liblldb fully functional. One result of having this target is it makes tracking dependencies much clearer.
Differential Revision: https://reviews.llvm.org/D48060
llvm-svn: 334968
Diffstat (limited to 'lldb/tools')
| -rw-r--r-- | lldb/tools/argdumper/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/tools/darwin-debug/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/tools/debugserver/source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/tools/driver/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | lldb/tools/lldb-server/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 13 deletions
diff --git a/lldb/tools/argdumper/CMakeLists.txt b/lldb/tools/argdumper/CMakeLists.txt index 9b22103bc8a..a59a4e7a851 100644 --- a/lldb/tools/argdumper/CMakeLists.txt +++ b/lldb/tools/argdumper/CMakeLists.txt @@ -1,4 +1,4 @@ -add_lldb_tool(lldb-argdumper INCLUDE_IN_FRAMEWORK +add_lldb_tool(lldb-argdumper INCLUDE_IN_SUITE argdumper.cpp LINK_LIBS diff --git a/lldb/tools/darwin-debug/CMakeLists.txt b/lldb/tools/darwin-debug/CMakeLists.txt index 2f28eab3a58..c2b5cb48648 100644 --- a/lldb/tools/darwin-debug/CMakeLists.txt +++ b/lldb/tools/darwin-debug/CMakeLists.txt @@ -1,3 +1,3 @@ -add_lldb_tool(darwin-debug INCLUDE_IN_FRAMEWORK +add_lldb_tool(darwin-debug INCLUDE_IN_SUITE darwin-debug.cpp ) diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index b763c7cfa4d..ec136039d34 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -161,7 +161,7 @@ if(NOT SKIP_DEBUGSERVER) COMPILE_DEFINITIONS HAVE_LIBCOMPRESSION) endif() set(LLVM_OPTIONAL_SOURCES ${lldbDebugserverCommonSources}) - add_lldb_tool(debugserver INCLUDE_IN_FRAMEWORK + add_lldb_tool(debugserver INCLUDE_IN_SUITE debugserver.cpp LINK_LIBS diff --git a/lldb/tools/driver/CMakeLists.txt b/lldb/tools/driver/CMakeLists.txt index 1fac2e5d168..3fec4c16c74 100644 --- a/lldb/tools/driver/CMakeLists.txt +++ b/lldb/tools/driver/CMakeLists.txt @@ -24,12 +24,4 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) add_definitions( -DIMPORT_LIBLLDB ) endif() -# Add lldb dependency on lldb-server if we can use it. -if ( LLDB_CAN_USE_LLDB_SERVER ) - add_dependencies(lldb lldb-server) -endif() - -# Add lldb dependency on debugserver if we can use it. -if ( LLDB_CAN_USE_DEBUGSERVER ) - add_dependencies(lldb debugserver) -endif() +add_dependencies(lldb lldb-suite) diff --git a/lldb/tools/lldb-server/CMakeLists.txt b/lldb/tools/lldb-server/CMakeLists.txt index 0593c706431..c74f553e965 100644 --- a/lldb/tools/lldb-server/CMakeLists.txt +++ b/lldb/tools/lldb-server/CMakeLists.txt @@ -42,7 +42,7 @@ else() list(APPEND LLDB_PLUGINS lldbPluginObjectFileELF) endif() -add_lldb_tool(lldb-server INCLUDE_IN_FRAMEWORK +add_lldb_tool(lldb-server INCLUDE_IN_SUITE Acceptor.cpp lldb-gdbserver.cpp lldb-platform.cpp |
