maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CMake] Configure the Info.plist so it contains a real version number. 

Use CMake to configure the Info.plist file so that we have a real
version number in things like crash reporter.
This commit is contained in:
Jonas Devlieghere 2019-11-15 09:46:27 -08:00
parent 8e34be2f25
commit 81104ea9ab
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/tools/driver/CMakeLists.txt
View File

@ -3,8 +3,12 @@ tablegen(LLVM Options.inc -gen-opt-parser-defs)
add_public_tablegen_target(LLDBOptionsTableGen)
if(APPLE)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/lldb-Info.plist.in
${CMAKE_CURRENT_BINARY_DIR}/lldb-Info.plist
)
# Inline info plist in binary (use target_link_options for this as soon as CMake 3.13 is available)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-sectcreate,__TEXT,__info_plist,${LLDB_SOURCE_DIR}/tools/driver/lldb-Info.plist")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_BINARY_DIR}/lldb-Info.plist")
endif()
add_lldb_tool(lldb

2
lldb/tools/driver/lldb-Info.plist → lldb/tools/driver/lldb-Info.plist.in
View File

@ -11,7 +11,7 @@
<key>CFBundleName</key>
<string>lldb</string>
<key>CFBundleVersion</key>
<string>360.99.0</string>
<string>${LLDB_VERSION}</string>
<key>SecTaskAccess</key>
<array>
<string>allowed</string>

10
lldb/tools/lldb-vscode/CMakeLists.txt
View File

@ -7,6 +7,16 @@ if (HAVE_LIBPTHREAD)
list(APPEND extra_libs pthread)
endif ()
if(APPLE)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/lldb-vscode-Info.plist.in
${CMAKE_CURRENT_BINARY_DIR}/lldb-vscode-Info.plist
)
# Inline info plist in binary (use target_link_options for this as soon as CMake 3.13 is available)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_BINARY_DIR}/lldb-vscode-Info.plist")
endif()
# We need to include the llvm components we depend on manually, as liblldb does
# not re-export those.
set(LLVM_LINK_COMPONENTS Support)

2
lldb/tools/lldb-vscode/lldb-vscode-Info.plist → lldb/tools/lldb-vscode/lldb-vscode-Info.plist.in
View File

@ -11,7 +11,7 @@
<key>CFBundleName</key>
<string>lldb-vscode</string>
<key>CFBundleVersion</key>
<string>360.99.0</string>
<string>${LLDB_VERSION}</string>
<key>SecTaskAccess</key>
<array>
<string>allowed</string>