[CMake] Move debugserver options to separate debugserverConfig.cmake

[sgraenitz]

Summary

One place for debugserver options, analog to LLDBConfig for LLDB options (see D55317). It was discussed in earlier reviews already, e.g. D55013.

[aprantl]

cmake/modules/debugserverConfig.cmake

3

I don't know CMake enough, but would it be feasible to have both file #include a fragment with the shared code?

[sgraenitz]

Avoid conflicts: updating diff for recent changes on master

[sgraenitz]

Remove LLDB_VERSION as it's not currently used by debugserver

[sgraenitz]

Revert accidental change utils/lldb-dotest/CMakeLists.txt

[sgraenitz]

cmake/modules/debugserverConfig.cmake

3

Yes I think this makes sense as soon as the number of duplicates grows.

BTW I double-checked and we don't use LLDB_VERSION in debugserver standalone yet, so for now I won't add it. Updated the review accordingly.

[sgraenitz]

Also remove code sign configuration as it moved back into debugserver in D55013. With this, debugserverConfig became really small (for the moment), but I still think it's good to have it as counterpart for LLDBConfig.

cmake/modules/debugserverConfig.cmake

+# Duplicate options from LLDBConfig that are relevant for debugserver Standalone builds.
+
+option(LLDB_USE_ENTITLEMENTS "When code signing, use entitlements if available" ON)
+set(LLDB_CODESIGN_IDENTITY lldb_codesign CACHE STRING
+    "Identity for code signing debugserver (Darwin only)")
+
+if(LLDB_CODESIGN_IDENTITY)
+  set(LLVM_CODESIGNING_IDENTITY ${LLDB_CODESIGN_IDENTITY} CACHE STRING "" FORCE)
+endif()

tools/debugserver/CMakeLists.txt

 cmake_minimum_required(VERSION 3.4.3)
 
 project(Debugserver LANGUAGES C CXX ASM-ATT)
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   set(CMAKE_MODULE_PATH
     ${CMAKE_MODULE_PATH}
     "${CMAKE_SOURCE_DIR}/../../cmake"
     "${CMAKE_SOURCE_DIR}/../../cmake/modules"
     )
 
   include(LLDBStandalone)
+  include(debugserverConfig)
   include(AddLLDB)
 
   set(LLDB_SOURCE_DIR "${CMAKE_SOURCE_DIR}/../../")
   include_directories(${LLDB_SOURCE_DIR}/include)
 
-  option(LLDB_USE_ENTITLEMENTS "When code signing, use entitlements if available" ON)
-  set(LLDB_CODESIGN_IDENTITY lldb_codesign CACHE STRING
-      "Identity for code signing debugserver (Darwin only)")
-
-  if(LLDB_CODESIGN_IDENTITY)
-    set(LLVM_CODESIGNING_IDENTITY ${LLDB_CODESIGN_IDENTITY} CACHE STRING "" FORCE)
-  endif()
-
   # lldb-suite is a dummy target that encompasses all the necessary tools and
   # libraries for building a fully-functioning liblldb.
   add_custom_target(lldb-suite)
   set(LLDB_SUITE_TARGET lldb-suite)
 endif()
 
 add_subdirectory(source)

utils/lldb-dotest/CMakeLists.txt

 # Make lldb-dotest a custom target.
 add_custom_target(lldb-dotest)
 add_dependencies(lldb-dotest ${LLDB_TEST_DEPS})
 
 get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY)
 
 # Generate wrapper for each build mode.
 if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
   foreach(LLVM_BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})
     string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_DOTEST_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
     string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_DOTEST_ARGS "${LLDB_DOTEST_ARGS}")
+    message("Generate wrapper for each build mode: LLDB_DOTEST_DIR for LLVM_BUILD_MODE == ${LLDB_DOTEST_DIR}")
     configure_file(
       lldb-dotest.in
       ${LLDB_DOTEST_DIR}/lldb-dotest
       )
   endforeach()
 else()
+  message("Generate wrapper for each build mode: LLDB_DOTEST_DIR == ${LLVM_RUNTIME_OUTPUT_INTDIR}")
   configure_file(
     lldb-dotest.in
     ${LLVM_RUNTIME_OUTPUT_INTDIR}/lldb-dotest
     )
 endif()