From 02e9b58771f7d48270f6b021efe71d2ec61d3d29 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 3 Nov 2016 18:54:48 +0100 Subject: [PATCH 1/2] CMake: remove absolute RPATH in avtranscoder python/java libraries --- src/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b9776da3..0f90103b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -107,7 +107,6 @@ if(SWIG_FOUND) set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION}) endif() # Force the library to look in the project lib folder relatively - set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1) if(APPLE) set_target_properties(${SWIG_MODULE_avtranscoder-py_REAL_NAME} PROPERTIES INSTALL_RPATH "@loader_path/../../..") else() @@ -161,7 +160,6 @@ if(SWIG_FOUND) set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES VERSION ${AVTRANSCODER_VERSION}) endif() # Force the library to look in the project lib folder relatively - set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1) if(APPLE) set_target_properties(${SWIG_MODULE_avtranscoder-java_REAL_NAME} PROPERTIES INSTALL_RPATH "@loader_path/..") else() From ddbbb0031cb128eaf4332b4b2adbf4715b4bbd63 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Thu, 3 Nov 2016 18:56:40 +0100 Subject: [PATCH 2/2] CMake: update RPATH in avtranscoder library * An absolute could be dangerous in other platform. * Put a relative path to the libraries which are put in the GitHub releases. --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0f90103b..4676f9a4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,7 +40,7 @@ else() endif() set_target_properties(avtranscoder-shared PROPERTIES SOVERSION ${AVTRANSCODER_VERSION_MAJOR}) set_target_properties(avtranscoder-shared PROPERTIES VERSION ${AVTRANSCODER_VERSION}) -set_target_properties(avtranscoder-shared PROPERTIES INSTALL_RPATH_USE_LINK_PATH 1) +set_target_properties(avtranscoder-shared PROPERTIES INSTALL_RPATH "$ORIGIN/../../install-dependency/lib:$ORIGIN") target_link_libraries(avtranscoder-shared ${FFMPEG_LIBRARIES}) target_include_directories(avtranscoder-shared PUBLIC ${AVTRANSCODER_SRC_PATH} ${FFMPEG_INCLUDE_DIR}) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy