Index: cmake/modules/debugserverConfig.cmake =================================================================== --- /dev/null +++ cmake/modules/debugserverConfig.cmake @@ -0,0 +1,9 @@ +# 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() Index: tools/debugserver/CMakeLists.txt =================================================================== --- tools/debugserver/CMakeLists.txt +++ tools/debugserver/CMakeLists.txt @@ -10,19 +10,12 @@ ) 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) Index: utils/lldb-dotest/CMakeLists.txt =================================================================== --- utils/lldb-dotest/CMakeLists.txt +++ utils/lldb-dotest/CMakeLists.txt @@ -9,12 +9,14 @@ 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