diff options
| author | Bruce Mitchener <bruce.mitchener@gmail.com> | 2015-07-24 00:13:45 +0000 |
|---|---|---|
| committer | Bruce Mitchener <bruce.mitchener@gmail.com> | 2015-07-24 00:13:45 +0000 |
| commit | b1e77a364299dcf9363faf832b0acefd53d58944 (patch) | |
| tree | 99ee709ee4d154f81981644b9f5c72a6e4cffb04 | |
| parent | 88958b2df30f7f225f7a64b713f5e6ce8f498b69 (diff) | |
| download | bcm5719-llvm-b1e77a364299dcf9363faf832b0acefd53d58944.tar.gz bcm5719-llvm-b1e77a364299dcf9363faf832b0acefd53d58944.zip | |
Fix Mac OS X build, debugserver version handling.
Summary:
No longer rely on cmake to set DEBUGSERVER_VERSION_STR,
but now generate the _vers.c file like xcode does
and include the generated file into the build on Mac OS X.
This fixes the cmake Mac OS X build after an earlier change
by Jason Molenda.
Reviewers: clayborg, jasonmolenda
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D11450
llvm-svn: 243072
| -rw-r--r-- | lldb/tools/debugserver/source/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lldb/tools/debugserver/source/MacOSX/CMakeLists.txt | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index 0c60c2f14fc..709e49ddc3d 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -34,9 +34,11 @@ if (CXX_SUPPORTS_NO_EXTENDED_OFFSETOF) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") endif () -add_definitions( - -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" - ) +if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_definitions( + -DDEBUGSERVER_VERSION_STR="${LLDB_VERSION}" + ) +endif () add_library(lldbDebugserverCommon #${dnbconfig_header} diff --git a/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt b/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt index 559079e44b0..2671d7bf766 100644 --- a/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt +++ b/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt @@ -18,6 +18,14 @@ add_custom_command(OUTPUT ${generated_mach_interfaces} DEPENDS ${dnbconfig_header} ) +set(DEBUGSERVER_VERS_GENERATED_FILE ${CMAKE_CURRENT_BINARY_DIR}/debugserver_vers.c) +set_source_files_properties(${DEBUGSERVER_VERS_GENERATED_FILE} PROPERTIES GENERATED 1) + +add_custom_command(OUTPUT ${DEBUGSERVER_VERS_GENERATED_FILE} + COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl + ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj debugserver + > ${DEBUGSERVER_VERS_GENERATED_FILE}) + set(DEBUGSERVER_USED_LIBS lldbDebugserverCommon lldbUtility @@ -40,6 +48,7 @@ add_lldb_executable(debugserver MachVMMemory.cpp MachVMRegion.cpp ${generated_mach_interfaces} + ${DEBUGSERVER_VERS_GENERATED_FILE} ) set_source_files_properties( |
