diff --git a/CMakeLists.txt b/CMakeLists.txt index bfa1c50c..95ff9cb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,7 @@ else() endif() set(LIBDIR ${DEFAULT_LIBDIR} CACHE PATH "Directory into which libraries should be installed (default: ${DEFAULT_LIBDIR})") +set(CMAKE_INSTALL_RPATH ${LIBDIR}) foreach(var CMAKE_INSTALL_PREFIX BINDIR DATADIR DOCDIR INCLUDEDIR LIBDIR) message(STATUS "${var} = ${${var}}") @@ -573,6 +574,9 @@ if(WITH_TURBOJPEG) if(MINGW) set_target_properties(turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at) endif() + if(APPLE) + set_target_properties(turbojpeg PROPERTIES MACOSX_RPATH 1) + endif() set_target_properties(turbojpeg PROPERTIES SOVERSION ${TURBOJPEG_SO_MAJOR_VERSION} VERSION ${TURBOJPEG_SO_VERSION}) if(TJMAPFLAG) @@ -1278,7 +1282,6 @@ endif() if(WIN32) set(EXE ".exe") endif() -SET(CMAKE_INSTALL_RPATH ${LIBDIR}) if(WITH_TURBOJPEG) if(ENABLE_SHARED) diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt index ac0625c4..6a655904 100755 --- a/sharedlib/CMakeLists.txt +++ b/sharedlib/CMakeLists.txt @@ -40,6 +40,9 @@ add_library(jpeg SHARED ${JPEG_SRCS} ${DEFFILE} $ set_target_properties(jpeg PROPERTIES SOVERSION ${SO_MAJOR_VERSION} VERSION ${SO_MAJOR_VERSION}.${SO_AGE}.${SO_MINOR_VERSION}) +if(APPLE) + set_target_properties(jpeg PROPERTIES MACOSX_RPATH 1) +endif() if(MAPFLAG) set_target_properties(jpeg PROPERTIES LINK_FLAGS "${MAPFLAG}${CMAKE_BINARY_DIR}/libjpeg.map")