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

[Bruce Mitchener via lldb-commits]

Author: brucem
Date: Thu Sep 17 13:35:33 2015
New Revision: 247913

URL: http://llvm.org/viewvc/llvm-project?rev=247913&view=rev
Log:
[cmake] Build lldb-server on Darwin, set dep on FreeBSD.

Summary:
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.

Reviewers: labath, emaste, tfiala

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D12925

Modified:
    lldb/trunk/cmake/modules/LLDBConfig.cmake
    lldb/trunk/tools/CMakeLists.txt

Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=247913&r1=247912&r2=247913&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake Thu Sep 17 13:35:33 2015
@@ -261,8 +261,9 @@ endif()
 
 # 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 "Darwin") OR
+    (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") OR
+    (CMAKE_SYSTEM_NAME MATCHES "Linux"))
     set(LLDB_CAN_USE_LLDB_SERVER 1)
 else()
     set(LLDB_CAN_USE_LLDB_SERVER 0)

Modified: lldb/trunk/tools/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/CMakeLists.txt?rev=247913&r1=247912&r2=247913&view=diff
==============================================================================
--- lldb/trunk/tools/CMakeLists.txt (original)
+++ lldb/trunk/tools/CMakeLists.txt Thu Sep 17 13:35:33 2015
@@ -7,6 +7,6 @@ endif()
 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()