[Lldb-commits] [PATCH] D12925: [cmake] Build lldb-server on Darwin, set dep on FreeBSD.

[Bruce Mitchener via lldb-commits]

brucem created this revision.
brucem added reviewers: labath, emaste, tfiala.
brucem added a subscriber: lldb-commits.

This switches the decision as to whether or not to lldb-server should
be built to check the same flag that was added that controls whether
or not it is added as a dependency to the 'lldb' target.

It also sets that flag on FreeBSD to maintain parity with the existing
build configuration / situation on FreeBSD.

http://reviews.llvm.org/D12925

Files:
  cmake/modules/LLDBConfig.cmake
  tools/CMakeLists.txt

Index: tools/CMakeLists.txt
===================================================================
--- tools/CMakeLists.txt
+++ tools/CMakeLists.txt
@@ -7,6 +7,6 @@
 if (NOT __ANDROID_NDK__)
   add_subdirectory(lldb-mi)
 endif()
-if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux")
+if (LLDB_CAN_USE_LLDB_SERVER)
   add_subdirectory(lldb-server)
 endif()
Index: cmake/modules/LLDBConfig.cmake
===================================================================
--- cmake/modules/LLDBConfig.cmake
+++ cmake/modules/LLDBConfig.cmake
@@ -261,8 +261,9 @@
 
 # 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 "Linux" ) OR
-     ( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) )
+if ((CMAKE_SYSTEM_NAME MATCHES "Linux") OR
+    (CMAKE_SYSTEM_NAME MATCHES "Darwin") OR
+    (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"))
     set(LLDB_CAN_USE_LLDB_SERVER 1)
 else()
     set(LLDB_CAN_USE_LLDB_SERVER 0)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12925.34967.patch
Type: text/x-patch
Size: 1016 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150917/afae8b95/attachment.bin>