From ac85c37de7182084e3f14defa83059d29fd57183 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 16 Oct 2016 12:08:30 +0300 Subject: [PATCH] Allow MAC OS X to find library inside a bundle. --- src/app/tape/tape.pro | 2 ++ src/app/valentina/valentina.pro | 2 ++ src/libs/qmuparser/qmuparser.pro | 3 +++ src/libs/vpropertyexplorer/vpropertyexplorer.pro | 3 +++ 4 files changed, 10 insertions(+) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 02df17f28..2b07bad7e 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -212,6 +212,8 @@ unix{ } } + QMAKE_RPATHDIR += @executable_path/../Frameworks + # Path to resources in app bundle #RESOURCES_DIR = "Contents/Resources" defined in translation.pri FRAMEWORKS_DIR = "Contents/Frameworks" diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index e187cebfe..409f9499e 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -264,6 +264,8 @@ unix{ } } + QMAKE_RPATHDIR += @executable_path/../Frameworks + # Path to resources in app bundle #RESOURCES_DIR = "Contents/Resources" defined in translation.pri FRAMEWORKS_DIR = "Contents/Frameworks" diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 026c57a4f..8a789efb0 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -41,6 +41,9 @@ include(qmuparser.pri) VERSION = 2.4.1 +# Allow MAC OS X to find library inside a bundle +macx:QMAKE_SONAME_PREFIX = @rpath + # Set "make install" command for Unix-like systems. unix:!macx{ isEmpty(PREFIX_LIB){ diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 36302808b..7dcad6d2b 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -37,6 +37,9 @@ MOC_DIR = moc # objecs files OBJECTS_DIR = obj +# Allow MAC OS X to find library inside a bundle +macx:QMAKE_SONAME_PREFIX = @rpath + include(vpropertyexplorer.pri) # Set "make install" command for Unix-like systems.