Build: Fix regr. that nuked RPATH in Mac/iOS build
Caused by 950580eb0c. Since the code that
sets CMAKE_INSTALL_RPATH now depends on ENABLE_SHARED, that code needed
to be moved to after the point at which ENABLE_SHARED is defined.
This commit is contained in:
@@ -109,10 +109,6 @@ endif()
|
|||||||
|
|
||||||
include(cmakescripts/GNUInstallDirs.cmake)
|
include(cmakescripts/GNUInstallDirs.cmake)
|
||||||
|
|
||||||
if(ENABLE_SHARED)
|
|
||||||
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
macro(report_directory var)
|
macro(report_directory var)
|
||||||
if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
|
if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
|
||||||
message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}")
|
message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}")
|
||||||
@@ -193,6 +189,10 @@ endif()
|
|||||||
report_option(ENABLE_SHARED "Shared libraries")
|
report_option(ENABLE_SHARED "Shared libraries")
|
||||||
report_option(ENABLE_STATIC "Static libraries")
|
report_option(ENABLE_STATIC "Static libraries")
|
||||||
|
|
||||||
|
if(ENABLE_SHARED)
|
||||||
|
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
|
||||||
|
endif()
|
||||||
|
|
||||||
if(WITH_12BIT)
|
if(WITH_12BIT)
|
||||||
set(WITH_ARITH_DEC 0)
|
set(WITH_ARITH_DEC 0)
|
||||||
set(WITH_ARITH_ENC 0)
|
set(WITH_ARITH_ENC 0)
|
||||||
|
|||||||
13
ChangeLog.md
13
ChangeLog.md
@@ -1,3 +1,16 @@
|
|||||||
|
2.0.2
|
||||||
|
=====
|
||||||
|
|
||||||
|
### Significant changes relative to 2.0.1:
|
||||||
|
|
||||||
|
1. Fixed a regression introduced by 2.0.1[5] that prevented a runtime search
|
||||||
|
path (rpath) from being embedded in the libjpeg-turbo shared libraries and
|
||||||
|
executables for macOS and iOS. This caused a fatal error of the form
|
||||||
|
"dyld: Library not loaded" when attempting to use one of the executables,
|
||||||
|
unless `DYLD_LIBRARY_PATH` was explicitly set to the location of the
|
||||||
|
libjpeg-turbo shared libraries.
|
||||||
|
|
||||||
|
|
||||||
2.0.1
|
2.0.1
|
||||||
=====
|
=====
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user