ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Fix RPATH handling

Browse Source 
CMAKE_INSTALL_RPATH has to be set before the targets are defined (oops.)

This also explicitly turns on MACOSX_RPATH for the shared libraries
(which is the default with newer versions of CMake but not with 2.8.x.)
The old autotools/libtool build system hard-coded the install name
directory of the OS X shared libraries to libdir, which meant that any
executable that linked against those libraries would also be hard-coded
to look for the libjpeg-turbo libraries in that directory.  @rpath makes
the OS X version of libjpeg-turbo behave like the Linux version, in the
sense that the executables under /opt/libjpeg-turbo/bin will
automatically pick up the libraries under /opt/libjpeg-turbo/lib* by
default, but other executables won't unless they are linked with -rpath.
This commit is contained in:
DRC
2016-11-23 17:12:57 -06:00
parent 6abd39160c
commit 27d4c5ea22
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -124,6 +124,7 @@ else()
endif() endif()
set(LIBDIR ${DEFAULT_LIBDIR} CACHE PATH set(LIBDIR ${DEFAULT_LIBDIR} CACHE PATH
"Directory into which libraries should be installed (default: ${DEFAULT_LIBDIR})") "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) foreach(var CMAKE_INSTALL_PREFIX BINDIR DATADIR DOCDIR INCLUDEDIR LIBDIR)
message(STATUS "${var} = ${${var}}") message(STATUS "${var} = ${${var}}")
@@ -573,6 +574,9 @@ if(WITH_TURBOJPEG)
if(MINGW) if(MINGW)
set_target_properties(turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at) set_target_properties(turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at)
endif() endif()
if(APPLE)
set_target_properties(turbojpeg PROPERTIES MACOSX_RPATH 1)
endif()
set_target_properties(turbojpeg PROPERTIES set_target_properties(turbojpeg PROPERTIES
SOVERSION ${TURBOJPEG_SO_MAJOR_VERSION} VERSION ${TURBOJPEG_SO_VERSION}) SOVERSION ${TURBOJPEG_SO_MAJOR_VERSION} VERSION ${TURBOJPEG_SO_VERSION})
if(TJMAPFLAG) if(TJMAPFLAG)
@@ -1278,7 +1282,6 @@ endif()
if(WIN32) if(WIN32)
set(EXE ".exe") set(EXE ".exe")
endif() endif()
SET(CMAKE_INSTALL_RPATH ${LIBDIR})
if(WITH_TURBOJPEG) if(WITH_TURBOJPEG)
if(ENABLE_SHARED) if(ENABLE_SHARED)

3
sharedlib/CMakeLists.txt
View File

@@ -40,6 +40,9 @@ add_library(jpeg SHARED ${JPEG_SRCS} ${DEFFILE} $<TARGET_OBJECTS:simd>
set_target_properties(jpeg PROPERTIES SOVERSION ${SO_MAJOR_VERSION} set_target_properties(jpeg PROPERTIES SOVERSION ${SO_MAJOR_VERSION}
VERSION ${SO_MAJOR_VERSION}.${SO_AGE}.${SO_MINOR_VERSION}) VERSION ${SO_MAJOR_VERSION}.${SO_AGE}.${SO_MINOR_VERSION})
if(APPLE)
set_target_properties(jpeg PROPERTIES MACOSX_RPATH 1)
endif()
if(MAPFLAG) if(MAPFLAG)
set_target_properties(jpeg PROPERTIES set_target_properties(jpeg PROPERTIES
LINK_FLAGS "${MAPFLAG}${CMAKE_BINARY_DIR}/libjpeg.map") LINK_FLAGS "${MAPFLAG}${CMAKE_BINARY_DIR}/libjpeg.map")