[Lldb-commits] [PATCH] D11450: Fix Mac OS X build, debugserver version handling.

[Bruce Mitchener]

brucem created this revision.
brucem added reviewers: clayborg, jasonmolenda.
brucem added a subscriber: lldb-commits.

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.

http://reviews.llvm.org/D11450

Files:
  tools/debugserver/source/CMakeLists.txt
  tools/debugserver/source/MacOSX/CMakeLists.txt

Index: tools/debugserver/source/MacOSX/CMakeLists.txt
===================================================================
--- tools/debugserver/source/MacOSX/CMakeLists.txt
+++ tools/debugserver/source/MacOSX/CMakeLists.txt
@@ -18,6 +18,14 @@
   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 @@
   MachVMMemory.cpp
   MachVMRegion.cpp
   ${generated_mach_interfaces}
+  ${DEBUGSERVER_VERS_GENERATED_FILE}
   )
 
 set_source_files_properties(
Index: tools/debugserver/source/CMakeLists.txt
===================================================================
--- tools/debugserver/source/CMakeLists.txt
+++ tools/debugserver/source/CMakeLists.txt
@@ -34,9 +34,11 @@
   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}



Index: tools/debugserver/source/MacOSX/CMakeLists.txt
===================================================================
--- tools/debugserver/source/MacOSX/CMakeLists.txt
+++ tools/debugserver/source/MacOSX/CMakeLists.txt
@@ -18,6 +18,14 @@
   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 @@
   MachVMMemory.cpp
   MachVMRegion.cpp
   ${generated_mach_interfaces}
+  ${DEBUGSERVER_VERS_GENERATED_FILE}
   )
 
 set_source_files_properties(
Index: tools/debugserver/source/CMakeLists.txt
===================================================================
--- tools/debugserver/source/CMakeLists.txt
+++ tools/debugserver/source/CMakeLists.txt
@@ -34,9 +34,11 @@
   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}

_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits