From: DRC <information@libjpeg-turbo.org>
Date: Tue, 1 Jan 2019 20:26:48 +0000 (-0600)
Subject: Build: Fix regr. that nuked RPATH in Mac/iOS build
X-Git-Tag: 2.0.2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c868e41b228d9782adde5e78c75e8b73150c2a0f;p=libjpeg-turbo

Build: Fix regr. that nuked RPATH in Mac/iOS build

Caused by 950580eb0c020598a4c6c8aa46c86e31062e1ddc.  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.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c01ac7d..96a2a5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,10 +109,6 @@ endif()
 
 include(cmakescripts/GNUInstallDirs.cmake)
 
-if(ENABLE_SHARED)
-  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
-endif()
-
 macro(report_directory var)
   if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
     message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}")
@@ -193,6 +189,10 @@ endif()
 report_option(ENABLE_SHARED "Shared libraries")
 report_option(ENABLE_STATIC "Static libraries")
 
+if(ENABLE_SHARED)
+  set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
+endif()
+
 if(WITH_12BIT)
   set(WITH_ARITH_DEC 0)
   set(WITH_ARITH_ENC 0)
diff --git a/ChangeLog.md b/ChangeLog.md
index 8c529ec..4d185bf 100644
--- a/ChangeLog.md
+++ b/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
 =====