palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-07-02 17:18:12 +02:00
Code Issues Projects Releases Wiki Activity

Setup rpaths only for dynamic libraries.

Browse source 
Property to disable the use of rpath.
This commit is contained in:
Roman Telezhynskyi 2023-01-09 12:16:36 +02:00
parent 11642ebfe1
commit 2221a35e7b
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qbs/imports/VApp.qbs
View file

@ -10,11 +10,15 @@ CppApplication {
cpp.minimumMacosVersion: buildconfig.minimumMacosVersion cpp.minimumMacosVersion: buildconfig.minimumMacosVersion
} }
cpp.rpaths: FileInfo.joinPaths(cpp.rpathOrigin, Properties {
"..", condition: buildconfig.enableRPath
qbs.targetOS.contains("macos") cpp.rpaths: FileInfo.joinPaths(cpp.rpathOrigin,
? "Frameworks" "..",
: buildconfig.installLibraryPath) qbs.targetOS.contains("macos")
? "Frameworks"
: buildconfig.installLibraryPath)
}
install: true install: true
installDir: buildconfig.installAppPath installDir: buildconfig.installAppPath
installDebugInformation: true installDebugInformation: true

10
qbs/imports/VLib.qbs
View file

@ -10,8 +10,14 @@ Library {
buildconfig.appTarget: "valentina" buildconfig.appTarget: "valentina"
bundle.isBundle: buildconfig.frameworksBuild bundle.isBundle: buildconfig.frameworksBuild
cpp.includePaths: [".."] cpp.includePaths: [".."]
cpp.sonamePrefix: qbs.targetOS.contains("macos") ? "@rpath" : undefined
cpp.rpaths: cpp.rpathOrigin // Allow MAC OS X to find library inside a bundle
cpp.sonamePrefix: (!buildconfig.staticBuild && qbs.targetOS.contains("macos")) ? "@rpath" : undefined
Properties {
condition: (!buildconfig.staticBuild && buildconfig.enableRPath)
cpp.rpaths: cpp.rpathOrigin
}
install: !buildconfig.staticBuild install: !buildconfig.staticBuild
installDir: buildconfig.installLibraryPath installDir: buildconfig.installLibraryPath

4
qbs/modules/buildconfig/buildconfig.qbs
View file

@ -12,6 +12,10 @@ Module {
// Use this property to disable building unit tests. // Use this property to disable building unit tests.
property bool enableUnitTests: true property bool enableUnitTests: true
// Use this property to disable the use of rpath. This can be used when packaging Valentina for distributions which
// do not permit the use of rpath, such as Fedora.
property bool enableRPath: true
property string libDirName: "lib" property string libDirName: "lib"
property string appTarget property string appTarget