mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-09-07 17:44:36 +02:00
Correction of build errors with MacOS Sonoma
This commit is contained in:
parent
b83c38f7b5
commit
b85e0fe3f8
|
@ -1,13 +1,24 @@
|
||||||
import qbs.FileInfo
|
import qbs.FileInfo
|
||||||
import qbs.File
|
import qbs.File
|
||||||
|
import qbs.Utilities
|
||||||
|
|
||||||
VTestApp {
|
VTestApp {
|
||||||
Depends { name: "buildconfig" }
|
Depends { name: "buildconfig" }
|
||||||
Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
|
Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
|
||||||
Depends { name: "VTestLib" }
|
Depends { name: "VTestLib" }
|
||||||
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
|
|
||||||
Depends { name: "autotest" }
|
Depends { name: "autotest" }
|
||||||
|
|
||||||
|
Depends {
|
||||||
|
name: "xerces-c"
|
||||||
|
condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && !buildconfig.useConanPackages
|
||||||
|
}
|
||||||
|
|
||||||
|
Depends {
|
||||||
|
name: "conan.XercesC"
|
||||||
|
condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
name: "CollectionTest"
|
name: "CollectionTest"
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
|
|
|
@ -1,12 +1,22 @@
|
||||||
import qbs.FileInfo
|
import qbs.FileInfo
|
||||||
|
import qbs.Utilities
|
||||||
|
|
||||||
VTestApp {
|
VTestApp {
|
||||||
Depends { name: "buildconfig" }
|
Depends { name: "buildconfig" }
|
||||||
Depends { name: "VTestLib" }
|
Depends { name: "VTestLib" }
|
||||||
Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
|
Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
|
||||||
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
|
|
||||||
Depends { name: "autotest" }
|
Depends { name: "autotest" }
|
||||||
|
|
||||||
|
Depends {
|
||||||
|
name: "xerces-c"
|
||||||
|
condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && !buildconfig.useConanPackages
|
||||||
|
}
|
||||||
|
|
||||||
|
Depends {
|
||||||
|
name: "conan.XercesC"
|
||||||
|
condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
|
||||||
|
}
|
||||||
|
|
||||||
name: "TranslationsTest"
|
name: "TranslationsTest"
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
|
|
Loading…
Reference in a new issue