Commit 81104ea9 authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[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.
parent 8e34be2f

lldb/tools/driver/CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -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

lldb/tools/driver/lldb-Info.plist→lldb/tools/driver/lldb-Info.plist.in

+1 −1
Original line number Diff line number Diff line
@@ -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>

lldb/tools/lldb-vscode/CMakeLists.txt

+10 −0
Original line number Diff line number Diff line
@@ -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)

lldb/tools/lldb-vscode/lldb-vscode-Info.plist→lldb/tools/lldb-vscode/lldb-vscode-Info.plist.in

+1 −1
Original line number Diff line number Diff line
@@ -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>