Skip to content

Commit 3824c52

Browse files
committed
Fixes for CMake install
1 parent 5d7e624 commit 3824c52

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Sources/Plasma/Apps/plClient/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,14 @@ if(PLASMA_EXTERNAL_RELEASE)
255255
endif(PLASMA_EXTERNAL_RELEASE)
256256

257257
if(APPLE)
258+
# CMake will attempt to strip rpaths, thus preventing fixup_bundle from finding libraries.
259+
# Not sure why - turning that off.
260+
set_target_properties(plClient PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
258261
install(
259262
CODE [[
260263
include("BundleUtilities")
261-
fixup_bundle("${CMAKE_INSTALL_PREFIX}/client/$<TARGET_PROPERTY:plClient,OUTPUT_NAME>.app" "" "${searchDirs}" IGNORE_ITEM Python)
262-
execute_process(COMMAND "codesign" "--remove-signature" "--deep" "-f" "${CMAKE_INSTALL_PREFIX}/client/$<TARGET_PROPERTY:plClient,OUTPUT_NAME>.app")
264+
fixup_bundle("${CMAKE_INSTALL_PREFIX}/client/$<TARGET_FILE_NAME:plClient>.app" "" "${searchDirs}" IGNORE_ITEM Python)
265+
execute_process(COMMAND "codesign" "--remove-signature" "--deep" "-f" "${CMAKE_INSTALL_PREFIX}/client/$<TARGET_FILE_NAME:plClient>.app")
263266
]]
264267
DESTINATION client
265268
)

0 commit comments

Comments
 (0)