diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 572846549a2c..0047f7721586 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -49,6 +49,13 @@ if(LLDB_BUILD_FRAMEWORK) if (NOT APPLE) message(FATAL_ERROR "LLDB.framework can only be generated when targeting Apple platforms") endif() + + # These are used to fill out LLDB-Info.plist. These are relevant when building + # the framework, and must be defined before building liblldb. + set(PRODUCT_NAME "LLDB") + set(EXECUTABLE_NAME "LLDB") + set(CURRENT_PROJECT_VERSION "360.99.0") + set(LLDB_FRAMEWORK_DIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_FRAMEWORK_INSTALL_DIR}) endif() diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake index 38b485020c5a..de8396d27f65 100644 --- a/lldb/cmake/modules/LLDBFramework.cmake +++ b/lldb/cmake/modules/LLDBFramework.cmake @@ -36,6 +36,7 @@ set_target_properties(liblldb PROPERTIES OUTPUT_NAME LLDB FRAMEWORK On FRAMEWORK_VERSION ${LLDB_FRAMEWORK_VERSION} + MACOSX_FRAMEWORK_INFO_PLIST ${LLDB_SOURCE_DIR}/resources/LLDB-Info.plist LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LLDB_FRAMEWORK_INSTALL_DIR} PUBLIC_HEADER "${framework_headers}") diff --git a/lldb/resources/LLDB-Info.plist b/lldb/resources/LLDB-Info.plist index 4a8bcaa96a7b..77330e2929cb 100644 --- a/lldb/resources/LLDB-Info.plist +++ b/lldb/resources/LLDB-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.apple.${PRODUCT_NAME:rfc1034identifier}.framework + com.apple.${PRODUCT_NAME}.framework CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType