Author: brucem Date: Thu Jul 23 19:13:45 2015 New Revision: 243072 URL: http://llvm.org/viewvc/llvm-project?rev=243072&view=rev Log: 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 Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/CMakeLists.txt?rev=243072&r1=243071&r2=243072&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/source/CMakeLists.txt (original) +++ lldb/trunk/tools/debugserver/source/CMakeLists.txt Thu Jul 23 19:13:45 2015 @@ -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} Modified: lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt?rev=243072&r1=243071&r2=243072&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt (original) +++ lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt Thu Jul 23 19:13:45 2015 @@ -18,6 +18,14 @@ add_custom_command(OUTPUT ${generated_ma 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( _______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
