This revision was automatically updated to reflect the committed changes. Closed by commit rL247913: [cmake] Build lldb-server on Darwin, set dep on FreeBSD. (authored by brucem).
Changed prior to commit: http://reviews.llvm.org/D12925?vs=35002&id=35021#toc Repository: rL LLVM http://reviews.llvm.org/D12925 Files: lldb/trunk/cmake/modules/LLDBConfig.cmake lldb/trunk/tools/CMakeLists.txt Index: lldb/trunk/tools/CMakeLists.txt =================================================================== --- lldb/trunk/tools/CMakeLists.txt +++ lldb/trunk/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: lldb/trunk/cmake/modules/LLDBConfig.cmake =================================================================== --- lldb/trunk/cmake/modules/LLDBConfig.cmake +++ lldb/trunk/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: lldb/trunk/tools/CMakeLists.txt =================================================================== --- lldb/trunk/tools/CMakeLists.txt +++ lldb/trunk/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: lldb/trunk/cmake/modules/LLDBConfig.cmake =================================================================== --- lldb/trunk/cmake/modules/LLDBConfig.cmake +++ lldb/trunk/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