From 8002e9de29f12c5afe63e1e1fa725bd3447fb42c Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Fri, 11 Mar 2022 23:11:56 -0500 Subject: [PATCH] - only overwrite rpath if not already defined --- source/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index dce666f78..d67ada70f 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1475,11 +1475,13 @@ if( NOT WIN32 AND NOT APPLE ) add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/link-make COMMAND /bin/sh -c ${CMAKE_CURRENT_BINARY_DIR}/link-make ) - set_target_properties(${PROJECT_NAME} PROPERTIES - #allow libzmusiclite.so.1 library in same folder as executable at runtime - INSTALL_RPATH "\$ORIGIN" - BUILD_WITH_INSTALL_RPATH ON - ) + IF ("${INSTALL_RPATH}" STREQUAL "") + set_target_properties(zdoom PROPERTIES + #allow libzmusic.so.1 library in same folder as executable at runtime + INSTALL_RPATH "\$ORIGIN" + BUILD_WITH_INSTALL_RPATH ON + ) + endif() endif() add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD