Fix handling of LLDB_VERS_GENERATED_FILE.

[brucem]

Summary

This is Darwin only.

The symbol defined by ${LLDB_VERS_GENERATED_FILE} is used by
source/lldb.cpp, so anything that uses lldb.cpp (which is in
lldbBase) should also have the generated symbol. This means
that the entire process can be centralized within source/CMakeLists.txt
where lldbBase is constructed.

Additionally, the custom command should have dependencies on the
project file as well as the generation script so that if either
changes, the version file is correctly re-generated and everything
is re-linked appropriately.

• cmake/LLDBDependencies.cmake: Remove everything related to the generated version file from here.

• source/CMakeLists.txt: On Darwin, add the generated version file to the sources that make up lldbBase. Also, create a custom target and make lldbBase depend on it to re-generate the generated file as needed.

• source/API/CMakeLists.txt: Don't need to build the generated version file here or use it to control linking against swig_wrapper.

• tools/lldb-server/CMakeLists.txt: Likewise.

[brucem]

I did NOT test this with a full rebuild as it is nearly my bedtime. I did test it with an incremental build as well as rm'ing the generated file and touching the (new) dependencies to make sure that the vers file got regenerated.

[brucem]

I have a full build from clean going with this. I'm pretty sure that it will be fine.

I'll check this into SVN after I wake up if someone agrees that it looks good.

[brucem]

Both builds from clean and incremental have now succeeded for me with this patch.

[zturner]

I'll defer to Dawn, I'm not too familiar with how the CMake Darwin stuff works. If the people interested say it works, that's fine with me.

[dawn]

Hi Bruce, thanks for this patch! I'll give it a try now...

[dawn]

Works great! Please commit. (Sorry for delay - I ran into problems with clang crashing on me for unknown reasons - finally got the build working again so I could test).

lldb/trunk/cmake/LLDBDependencies.cmake

if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
   list(APPEND LLDB_USED_LIBS
     lldbPluginProcessFreeBSD
     lldbPluginProcessPOSIX
     )
 endif ()
 
 # Darwin-only libraries
 if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-  set(LLDB_VERS_GENERATED_FILE ${LLDB_BINARY_DIR}/source/LLDB_vers.c)
-  add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE}
-    COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
-            ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj liblldb_core
-            > ${LLDB_VERS_GENERATED_FILE})
-
-  set_source_files_properties(${LLDB_VERS_GENERATED_FILE} PROPERTIES GENERATED 1)
   list(APPEND LLDB_USED_LIBS
     lldbPluginDynamicLoaderDarwinKernel
     lldbPluginObjectFileMachO
     lldbPluginProcessMachCore
     lldbPluginProcessMacOSXKernel
     lldbPluginSymbolVendorMacOSX
     )
 endif()

lldb/trunk/source/API/CMakeLists.txt

add_lldb_library(liblldb SHARED
   SBTypeSynthetic.cpp
   SBValue.cpp
   SBValueList.cpp
   SBVariablesOptions.cpp
   SBWatchpoint.cpp
   SBUnixSignals.cpp
   SystemInitializerFull.cpp
   ${LLDB_WRAP_PYTHON}
-  ${LLDB_VERS_GENERATED_FILE}
   )
 
 # This should not be part of LLDBDependencies.cmake, because we don't
 # want every single library taking a dependency on the script interpreters.
 target_link_libraries(liblldb PRIVATE
   lldbPluginScriptInterpreterNone
   lldbPluginScriptInterpreterPython
   )
if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
   endif()
 else()
   set_target_properties(liblldb
     PROPERTIES
     OUTPUT_NAME lldb
     )
 endif()
 
-if (LLDB_WRAP_PYTHON OR LLDB_VERS_GENERATED_FILE)
+if (LLDB_WRAP_PYTHON)
   add_dependencies(liblldb swig_wrapper)
 endif()
 target_link_libraries(liblldb ${cmake_2_8_12_PRIVATE} ${LLDB_SYSTEM_LIBS})
 

lldb/trunk/source/CMakeLists.txt

 include_directories(.)
 
 if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
 include_directories(
   Plugins/Process/Linux
   Plugins/Process/POSIX
   )
 endif ()
 
 if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
 include_directories(
   Plugins/Process/FreeBSD
   Plugins/Process/POSIX
   )
 endif ()
 
-add_lldb_library(lldbBase
+set(lldbBase_SOURCES
     lldb.cpp
   )
 
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  set(LLDB_VERS_GENERATED_FILE ${LLDB_BINARY_DIR}/source/LLDB_vers.c)
+  add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE}
+    COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
+            ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj liblldb_core
+            > ${LLDB_VERS_GENERATED_FILE}
+    DEPENDS ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
+            ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj)
+  set_source_files_properties(${LLDB_VERS_GENERATED_FILE} PROPERTIES GENERATED 1)
+  # Add this to lldbBase since lldb.cpp uses the symbol defined here.
+  list(APPEND lldbBase_SOURCES ${LLDB_VERS_GENERATED_FILE})
+  add_custom_target(lldbGeneratedVersion
+    DEPENDS ${LLDB_VERS_GENERATED_FILE})
+endif()
+
+add_lldb_library(lldbBase
+  ${lldbBase_SOURCES}
+  )
+
+if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+  add_dependencies(lldbBase lldbGeneratedVersion)
+endif()
+
 add_subdirectory(Breakpoint)
 add_subdirectory(Commands)
 add_subdirectory(Core)
 add_subdirectory(DataFormatters)
 add_subdirectory(Expression)
 add_subdirectory(Host)
 add_subdirectory(Initialization)
 add_subdirectory(Interpreter)

lldb/trunk/tools/lldb-server/CMakeLists.txt

if (BUILD_SHARED_LIBS )
   target_link_libraries(lldb-server liblldb)
   target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})
 else()
   add_lldb_executable(lldb-server
     lldb-gdbserver.cpp
     lldb-platform.cpp
     lldb-server.cpp
     LLDBServerUtilities.cpp
-    ../../source/lldb.cpp
-    ${LLDB_VERS_GENERATED_FILE}
     )
 
-  if (LLDB_VERS_GENERATED_FILE)
-    add_dependencies(lldb-server swig_wrapper)
-  endif()
-
   # The Darwin linker doesn't understand --start-group/--end-group.
   if (LLDB_LINKER_SUPPORTS_GROUPS)
     target_link_libraries(lldb-server
                           -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
     target_link_libraries(lldb-server
                           -Wl,--start-group ${CLANG_USED_LIBS} -Wl,--end-group)
   else()
     target_link_libraries(lldb-server ${LLDB_USED_LIBS})