From a92bd7602fdb057fac30e4c34ca8f343bf19aa85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Sun, 8 Mar 2020 21:05:36 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@752
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 CMakeLists.txt | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c55c2e8..60f801a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,17 +17,20 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 set(LIBPROJECT 1)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
-if(APPLE)
-	set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks")
-	set(CMAKE_MACOSX_RPATH ${CMAKE_INSTALL_RPATH})
-	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
-	if(NOT CMAKE_CROSSCOMPILING)
-		include_directories(/usr/local/include)
-		link_directories(/usr/local/lib)
-	endif()
-endif()
 if(MINGW)
 	find_package(MinGW REQUIRED)
+else()
+	if(APPLE)
+		set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks;@executable_path/lib;@loader_path/../lib")
+		set(CMAKE_MACOSX_RPATH ${CMAKE_INSTALL_RPATH})
+		if(NOT CMAKE_CROSSCOMPILING)
+			include_directories(/usr/local/include)
+			link_directories(/usr/local/lib)
+		endif()
+	else()
+		set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:\$ORIGIN/lib")
+	endif()
+	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 endif()
 if (DEFINED ANDROID_PLATFORM)
 	include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)