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

[Bruce Mitchener via lldb-commits]

brucem updated this revision to Diff 35002.
brucem added a comment.

Put in alpha order as emaste suggested.


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 "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)



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 "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)

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits