From c10b9576894ec6c5230070f383ac78916f62113a Mon Sep 17 00:00:00 2001 From: casey langen Date: Mon, 27 Dec 2021 18:55:37 -0800 Subject: [PATCH] Update -rpath usage. --- CHANGELOG.txt | 4 ++++ src/core_c_demo/CMakeLists.txt | 2 +- src/musikcube/CMakeLists.txt | 2 +- src/musikcubed/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b1acefa8f..624a5818c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,7 @@ +0.96.9 + +* fixed `-rpath` to use `$ORIGIN` instead of `./` to appease `Feodra 35`. + 0.96.8 * updated `FfmpegDecoder` to perform resampling internally when `WasapiOutput` diff --git a/src/core_c_demo/CMakeLists.txt b/src/core_c_demo/CMakeLists.txt index 88b421851..fc1b39026 100644 --- a/src/core_c_demo/CMakeLists.txt +++ b/src/core_c_demo/CMakeLists.txt @@ -9,6 +9,6 @@ endif() add_executable(core_c_demo ${CORE_C_DEMO_SRCS}) -set_target_properties(core_c_demo PROPERTIES LINK_FLAGS "-Wl,-rpath,./") +set_target_properties(core_c_demo PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN") target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} musikcore) diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt index 916fe1960..021f368bb 100644 --- a/src/musikcube/CMakeLists.txt +++ b/src/musikcube/CMakeLists.txt @@ -79,7 +79,7 @@ configure_file("musikcube.in" "musikcube" @ONLY) add_executable(musikcube ${CUBE_SRCS}) add_definitions(-DNCURSES_WIDECHAR) -set_target_properties(musikcube PROPERTIES LINK_FLAGS "-Wl,-rpath,./") +set_target_properties(musikcube PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN") if (CMAKE_SYSTEM_NAME MATCHES "Darwin") if (${LINK_STATICALLY} MATCHES "true") diff --git a/src/musikcubed/CMakeLists.txt b/src/musikcubed/CMakeLists.txt index df208280d..84e0eb736 100644 --- a/src/musikcubed/CMakeLists.txt +++ b/src/musikcubed/CMakeLists.txt @@ -12,7 +12,7 @@ endif() configure_file("musikcubed.in" "musikcubed" @ONLY) add_executable(musikcubed ${DAEMON_SRCS}) -set_target_properties(musikcubed PROPERTIES LINK_FLAGS "-Wl,-rpath,./") +set_target_properties(musikcubed PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN") if (${LINK_STATICALLY} MATCHES "true") find_library(EVLIB NAMES libev.a ev)