diff options
| author | Alex Langford <apl@fb.com> | 2018-06-19 02:59:30 +0000 |
|---|---|---|
| committer | Alex Langford <apl@fb.com> | 2018-06-19 02:59:30 +0000 |
| commit | f66a36d2dc2641c7056be5329f3491a159e21881 (patch) | |
| tree | d6a2669b60e82b8bb4b345c0253fd50b480928c8 | |
| parent | 972a462a7ec6097836e66cf0532e5390919e2b31 (diff) | |
| download | bcm5719-llvm-f66a36d2dc2641c7056be5329f3491a159e21881.tar.gz bcm5719-llvm-f66a36d2dc2641c7056be5329f3491a159e21881.zip | |
Fix up Info.plist when building LLDB.framework with CMake
Summary:
We weren't using the Info.plist template in resources previously.
When using that template, some of the key's values weren't being populated
because some variables were not being defined. In one case, CMake didn't
like the substring expansion syntax of CFBundleIdentifier so I got rid of that.
Differential Revision: https://reviews.llvm.org/D47792
llvm-svn: 335014
| -rw-r--r-- | lldb/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBFramework.cmake | 1 | ||||
| -rw-r--r-- | lldb/resources/LLDB-Info.plist | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 572846549a2..0047f772158 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 38b485020c5..de8396d27f6 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 4a8bcaa96a7..77330e2929c 100644 --- a/lldb/resources/LLDB-Info.plist +++ b/lldb/resources/LLDB-Info.plist @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>com.apple.${PRODUCT_NAME:rfc1034identifier}.framework</string> + <string>com.apple.${PRODUCT_NAME}.framework</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> |
