[Lldb-commits] [PATCH] D47792: Fix up Info.plist when building LLDB.framework with CMake

[Alex Langford via Phabricator via lldb-commits]

xiaobai updated this revision to Diff 151840.
xiaobai added a comment.

Rebasing this commit after my framework refactor


https://reviews.llvm.org/D47792

Files:
  CMakeLists.txt
  cmake/modules/LLDBFramework.cmake
  resources/LLDB-Info.plist


Index: resources/LLDB-Info.plist
===================================================================
--- resources/LLDB-Info.plist
+++ 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>
Index: cmake/modules/LLDBFramework.cmake
===================================================================
--- cmake/modules/LLDBFramework.cmake
+++ cmake/modules/LLDBFramework.cmake
@@ -36,6 +36,7 @@
   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}")
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -49,6 +49,13 @@
   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()



Index: resources/LLDB-Info.plist
===================================================================
--- resources/LLDB-Info.plist
+++ 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>
Index: cmake/modules/LLDBFramework.cmake
===================================================================
--- cmake/modules/LLDBFramework.cmake
+++ cmake/modules/LLDBFramework.cmake
@@ -36,6 +36,7 @@
   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}")
 
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -49,6 +49,13 @@
   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()

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits