aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on Linux.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-01-28 08:07:12 +02:00
parent 8b42f12a20
commit 4dd424262e
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qbs/imports/VApp.qbs
View File

@ -3,7 +3,7 @@ import qbs.Utilities
CppApplication { CppApplication {
Depends { name: "buildconfig" } Depends { name: "buildconfig" }
Depends { name: "bundle" } Depends { name: "bundle"; condition: qbs.targetOS.contains("macos") }
Properties { Properties {
condition: qbs.targetOS.contains("macos") condition: qbs.targetOS.contains("macos")

4
qbs/imports/VLib.qbs
View File

@ -2,13 +2,12 @@ import qbs.FileInfo
Library { Library {
Depends { name: "buildconfig" } Depends { name: "buildconfig" }
Depends { name: "bundle" } Depends { name: "bundle"; condition: qbs.targetOS.contains("macos") }
Depends { name: "cpp" } Depends { name: "cpp" }
type: buildconfig.staticBuild ? "staticlibrary" : "dynamiclibrary" type: buildconfig.staticBuild ? "staticlibrary" : "dynamiclibrary"
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina" buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina"
bundle.isBundle: buildconfig.frameworksBuild
cpp.includePaths: [".."] cpp.includePaths: [".."]
// Allow MAC OS X to find library inside a bundle // Allow MAC OS X to find library inside a bundle
@ -30,5 +29,6 @@ Library {
Properties { Properties {
condition: qbs.targetOS.contains("macos") condition: qbs.targetOS.contains("macos")
cpp.minimumMacosVersion: buildconfig.minimumMacosVersion cpp.minimumMacosVersion: buildconfig.minimumMacosVersion
bundle.isBundle: buildconfig.frameworksBuild
} }
} }

6
qbs/imports/VTestApp.qbs
View File

@ -1,6 +1,10 @@
VApp { VApp {
type: base.concat("autotest") type: base.concat("autotest")
bundle.isBundle: false
install: false install: false
condition: buildconfig.enableUnitTests condition: buildconfig.enableUnitTests
Properties {
condition: qbs.targetOS.contains("macos")
bundle.isBundle: false
}
} }

11
qbs/imports/VToolApp.qbs
View File

@ -15,7 +15,7 @@ VApp {
installDir: buildconfig.installBinaryPath installDir: buildconfig.installBinaryPath
installDebugInformation: qbs.buildVariant !== "release" installDebugInformation: qbs.buildVariant !== "release"
consoleApplication: false consoleApplication: false
bundle.isBundle: qbs.buildVariant === "release"
bundle.identifierPrefix: 'ua.com.smart-pattern' bundle.identifierPrefix: 'ua.com.smart-pattern'
property bool primaryApp: false property bool primaryApp: false
@ -24,6 +24,13 @@ VApp {
"NSHumanReadableCopyright": buildconfig.valentina_copyright_string "NSHumanReadableCopyright": buildconfig.valentina_copyright_string
}) })
Properties {
// Breakpoints do not work if debug the app inside of bundle. In debug mode we turn off creating a bundle.
// Probably it will breake some dependencies. Version for Mac designed to work inside an app bundle.
condition: qbs.targetOS.contains("macos")
bundle.isBundle: qbs.buildVariant === "release"
}
Properties { Properties {
condition: buildconfig.enableAppImage && qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos") condition: buildconfig.enableAppImage && qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
cpp.dynamicLibraries: ["icudata", "icui18n", "icuuc"] cpp.dynamicLibraries: ["icudata", "icui18n", "icuuc"]
@ -202,7 +209,7 @@ VApp {
} }
Properties { Properties {
condition: i18nconfig.limitDeploymentOfQtTranslations condition: qbs.targetOS.contains("windows") && i18nconfig.limitDeploymentOfQtTranslations
windeployqt.languages: i18nconfig.qtTranslationLocales.join(',') windeployqt.languages: i18nconfig.qtTranslationLocales.join(',')
} }