[Lldb-commits] [lldb] r360621 - [CMake] Simplify lldb-server handling
Jonas Devlieghere via lldb-commits
lldb-commits at lists.llvm.org
Mon May 13 14:25:02 PDT 2019
Author: jdevlieghere
Date: Mon May 13 14:25:02 2019
New Revision: 360621
URL: http://llvm.org/viewvc/llvm-project?rev=360621&view=rev
Log:
[CMake] Simplify lldb-server handling
We can piggyback off the existing add_lldb_tool_subdirectory to decide
whether or not lldb-server should be built.
Differential revision: https://reviews.llvm.org/D61872
Modified:
lldb/trunk/cmake/modules/LLDBConfig.cmake
lldb/trunk/tools/CMakeLists.txt
lldb/trunk/unittests/tools/CMakeLists.txt
Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=360621&r1=360620&r2=360621&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake Mon May 13 14:25:02 2019
@@ -414,14 +414,10 @@ endif()
list(APPEND system_libs ${CMAKE_DL_LIBS})
-SET(SKIP_LLDB_SERVER_BUILD OFF CACHE BOOL "Skip building lldb-server")
-
# Figure out if lldb could use lldb-server. If so, then we'll
# ensure we build lldb-server when an lldb target is being built.
-if (CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")
- set(LLDB_CAN_USE_LLDB_SERVER 1)
-else()
- set(LLDB_CAN_USE_LLDB_SERVER 0)
+if (NOT CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")
+ set(LLDB_TOOL_LLDB_SERVER_BUILD OFF)
endif()
# Figure out if lldb could use debugserver. If so, then we'll
Modified: lldb/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/CMakeLists.txt?rev=360621&r1=360620&r2=360621&view=diff
==============================================================================
--- lldb/trunk/tools/CMakeLists.txt (original)
+++ lldb/trunk/tools/CMakeLists.txt Mon May 13 14:25:02 2019
@@ -9,13 +9,10 @@ add_subdirectory(lldb-test EXCLUDE_FROM_
add_lldb_tool_subdirectory(lldb-instr)
add_lldb_tool_subdirectory(lldb-mi)
+add_lldb_tool_subdirectory(lldb-server)
add_lldb_tool_subdirectory(lldb-vscode)
if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
add_subdirectory(darwin-debug)
add_subdirectory(debugserver)
endif()
-
-if (LLDB_CAN_USE_LLDB_SERVER AND NOT SKIP_LLDB_SERVER_BUILD)
- add_subdirectory(lldb-server)
-endif()
Modified: lldb/trunk/unittests/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/tools/CMakeLists.txt?rev=360621&r1=360620&r2=360621&view=diff
==============================================================================
--- lldb/trunk/unittests/tools/CMakeLists.txt (original)
+++ lldb/trunk/unittests/tools/CMakeLists.txt Mon May 13 14:25:02 2019
@@ -1,9 +1,6 @@
-add_subdirectory(lldb-mi)
-if(CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|Linux|NetBSD")
- if ((CMAKE_SYSTEM_NAME MATCHES "Darwin" AND SKIP_TEST_DEBUGSERVER) OR (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND SKIP_LLDB_SERVER_BUILD))
- # These tests are meant to test lldb-server/debugserver in isolation, and
- # don't provide any value if run against a server copied from somewhere.
- else()
- add_subdirectory(lldb-server)
- endif()
+if(LLDB_TOOL_LLDB_MI_BUILD)
+ add_subdirectory(lldb-mi)
+endif()
+if(LLDB_TOOL_LLDB_SERVER_BUILD)
+ add_subdirectory(lldb-server)
endif()
More information about the lldb-commits
mailing list