Compare commits

...

2 Commits

Author SHA1 Message Date
Roman Telezhynskyi 08b8023f3c Merge branch 'develop' into 'develop'
Correction of build errors with MacOS Sonoma

See merge request smart-pattern/valentina!16
2024-02-13 11:02:27 +00:00
Yann Lossouarn b85e0fe3f8 Correction of build errors with MacOS Sonoma 2024-02-13 11:59:34 +01:00
2 changed files with 23 additions and 2 deletions

View File

@ -1,13 +1,24 @@
import qbs.FileInfo
import qbs.File
import qbs.Utilities
VTestApp {
Depends { name: "buildconfig" }
Depends { name: "Qt"; submodules: ["testlib", "gui", "printsupport"] }
Depends { name: "VTestLib" }
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
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"
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
targetName: buildconfig.appTarget

View File

@ -1,12 +1,22 @@
import qbs.FileInfo
import qbs.Utilities
VTestApp {
Depends { name: "buildconfig" }
Depends { name: "VTestLib" }
Depends { name: "Qt"; submodules: ["testlib", "xml", "gui", "printsupport"] }
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
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"
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
targetName: buildconfig.appTarget