[Lldb-commits] [lldb] r180243 - More CMake fixes for OS X.
Filipe Cabecinhas
me at filcab.net
Wed Apr 24 18:36:53 PDT 2013
Author: filcab
Date: Wed Apr 24 20:36:53 2013
New Revision: 180243
URL: http://llvm.org/viewvc/llvm-project?rev=180243&view=rev
Log:
More CMake fixes for OS X.
Modified:
lldb/trunk/CMakeLists.txt
lldb/trunk/source/CMakeLists.txt
lldb/trunk/source/Host/CMakeLists.txt
lldb/trunk/source/Host/macosx/CMakeLists.txt
lldb/trunk/source/Plugins/OperatingSystem/CMakeLists.txt
lldb/trunk/source/Plugins/Platform/CMakeLists.txt
lldb/trunk/source/Plugins/SymbolVendor/CMakeLists.txt
lldb/trunk/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
lldb/trunk/source/Utility/CMakeLists.txt
Modified: lldb/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -172,6 +172,8 @@ macro(add_lldb_library name)
if(LLDB_USED_LIBS)
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
target_link_libraries(${name} -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
+ else()
+ target_link_libraries(${name} ${LLDB_USED_LIBS})
endif()
endif()
target_link_libraries(${name} ${CLANG_USED_LIBS})
@@ -222,6 +224,23 @@ install(DIRECTORY include/
PATTERN ".svn" EXCLUDE
)
+
+# Find libraries or frameworks that may be needed
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ find_library(CARBON_LIBRARY Carbon)
+ find_library(FOUNDATION_LIBRARY Foundation)
+ find_library(CORE_FOUNDATION_LIBRARY CoreFoundation)
+ find_library(CORE_SERVICES_LIBRARY CoreServices)
+ find_library(SECURITY_LIBRARY Security)
+ find_library(DEBUG_SYMBOLS_LIBRARY DebugSymbols PATHS "/System/Library/PrivateFrameworks")
+
+ set(LIBXML2_INCLUDE_DIR "/usr/include/libxml2")
+ list(APPEND system_libs xml2)
+ list(APPEND system_libs ${CARBON_LIBRARY} ${FOUNDATION_LIBRARY}
+ ${CORE_FOUNDATION_LIBRARY} ${CORE_SERVICES_LIBRARY} ${SECURITY_LIBRARY}
+ ${DEBUG_SYMBOLS_LIBRARY})
+endif()
+
#add_subdirectory(include)
add_subdirectory(scripts)
add_subdirectory(source)
Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -38,12 +38,14 @@ set( LLDB_USED_LIBS
lldbPluginSymbolFileDWARF
lldbPluginSymbolFileSymtab
lldbPluginDynamicLoaderStatic
+ lldbPluginDynamicLoaderPosixDYLD
lldbPluginObjectFileMachO
lldbPluginObjectFileELF
lldbPluginObjectContainerBSDArchive
lldbPluginObjectContainerMachOArchive
lldbPluginProcessGDBRemote
+ lldbPluginProcessMachCore
lldbPluginProcessUtility
lldbPluginPlatformGDB
lldbPluginPlatformFreeBSD
@@ -53,7 +55,6 @@ set( LLDB_USED_LIBS
lldbPluginObjectContainerBSDArchive
lldbPluginPlatformMacOSX
lldbPluginDynamicLoaderMacOSXDYLD
- lldbPluginDynamicLoaderPosixDYLD
lldbPluginUnwindAssemblyInstEmulation
lldbPluginUnwindAssemblyX86
lldbPluginDynamicLoaderDarwinKernel
@@ -85,6 +86,16 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
)
endif ()
+# Darwin-only libraries
+if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+ list(APPEND LLDB_USED_LIBS
+ lldbHostMacOSX
+ lldbPluginOSDarwinKernel
+ lldbPluginProcessMacOSXKernel
+ lldbPluginSymbolVendorMacOSX
+ )
+endif()
+
set( CLANG_USED_LIBS
clangAnalysis
clangAST
Modified: lldb/trunk/source/Host/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/Host/CMakeLists.txt (original)
+++ lldb/trunk/source/Host/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -1,3 +1,11 @@
add_subdirectory(common)
-add_subdirectory(linux)
-#add_subdirectory(windows)
+
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ add_subdirectory(macosx)
+elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ add_subdirectory(linux)
+elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ add_subdirectory(freebsd)
+#elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
+# add_subdirectory(windows)
+endif()
Modified: lldb/trunk/source/Host/macosx/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/CMakeLists.txt (original)
+++ lldb/trunk/source/Host/macosx/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -1,6 +1,14 @@
set(LLVM_NO_RTTI 1)
+include_directories(${LIBXML2_INCLUDE_DIR})
+
add_lldb_library(lldbHostMacOSX
- Host.cpp
+ Host.mm
Symbols.cpp
+ cfcpp/CFCBundle.cpp
+ cfcpp/CFCData.cpp
+ cfcpp/CFCMutableArray.cpp
+ cfcpp/CFCMutableDictionary.cpp
+ cfcpp/CFCMutableSet.cpp
+ cfcpp/CFCString.cpp
)
Modified: lldb/trunk/source/Plugins/OperatingSystem/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/OperatingSystem/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/OperatingSystem/CMakeLists.txt (original)
+++ lldb/trunk/source/Plugins/OperatingSystem/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -1,2 +1,4 @@
-#add_subdirectory(Darwin-Kernel)
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ add_subdirectory(Darwin-Kernel)
+endif()
add_subdirectory(Python)
Modified: lldb/trunk/source/Plugins/Platform/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Platform/CMakeLists.txt (original)
+++ lldb/trunk/source/Plugins/Platform/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -1,5 +1,11 @@
-add_subdirectory(FreeBSD)
+#if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+ add_subdirectory(Linux)
+#elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ add_subdirectory(FreeBSD)
+#elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ add_subdirectory(MacOSX)
+#elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
+# add_subdirectory(Windows)
+#endif()
+
add_subdirectory(gdb-server)
-add_subdirectory(Linux)
-add_subdirectory(MacOSX)
-#add_subdirectory(Windows)
Modified: lldb/trunk/source/Plugins/SymbolVendor/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolVendor/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolVendor/CMakeLists.txt (original)
+++ lldb/trunk/source/Plugins/SymbolVendor/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -1 +1,3 @@
-#add_subdirectory(MacOSX)
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ add_subdirectory(MacOSX)
+endif()
Modified: lldb/trunk/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt (original)
+++ lldb/trunk/source/Plugins/SymbolVendor/MacOSX/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -1,5 +1,7 @@
set(LLVM_NO_RTTI 1)
+include_directories(${LIBXML2_INCLUDE_DIR})
+
add_lldb_library(lldbPluginSymbolVendorMacOSX
SymbolVendorMacOSX.cpp
)
Modified: lldb/trunk/source/Utility/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/CMakeLists.txt?rev=180243&r1=180242&r2=180243&view=diff
==============================================================================
--- lldb/trunk/source/Utility/CMakeLists.txt (original)
+++ lldb/trunk/source/Utility/CMakeLists.txt Wed Apr 24 20:36:53 2013
@@ -10,4 +10,3 @@ add_lldb_library(lldbUtility
StringExtractorGDBRemote.cpp
TimeSpecTimeout.cpp
)
-
More information about the lldb-commits
mailing list