From 19f0a3016066be1e5bc15c10d5d681f529acc088 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 28 Jan 2014 08:43:59 +0100
Subject: [PATCH] Include $ORIGIN in portable mode on unix
---
CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 592ba5f57..3f1796bd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,11 @@ endif()
if(APPLE)
set(CMAKE_MACOSX_RPATH TRUE)
- set(CMAKE_INSTALL_RPATH
- "${CMAKE_INSTALL_RPATH};@loader_path/;@executable_path/")
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ list(APPEND CMAKE_INSTALL_RPATH "@loader_path/" "@executable_path/")
+elseif(UNIX AND NOT UNIX_STRUCTURE)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN")
endif()
if(NOT INSTALLER_RUN)
--
GitLab