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

Disable warnings from xerces-c with pkg-config.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-08-18 13:48:03 +03:00
parent bb43ff07ea
commit 4dbac33c96
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qbs/modules/buildconfig/buildconfig.qbs
View File

@ -813,7 +813,21 @@ Module {
cpp.systemIncludePaths: { cpp.systemIncludePaths: {
var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")]; var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
if (Utilities.versionCompare(qbs.version, "1.22") < 0) { if (Utilities.versionCompare(Qt.core.version, "6") >= 0 && !useConanPackages)
{
var includePaths = product.cpp.includePaths;
for(var i = 0; i < includePaths.length; i++)
{
if (includePaths[i].includes("xerces-c"))
{
paths.push(includePaths[i]);
}
}
}
if (Utilities.versionCompare(qbs.version, "1.22") < 0)
{
var qtLibs = [ var qtLibs = [
"QtCore", "QtCore",
"QtSvg", "QtSvg",

11
src/app/tape/tape.qbs
View File

@ -15,7 +15,16 @@ VToolApp {
Depends { name: "ebr" } Depends { name: "ebr" }
Depends { name: "multibundle"; } Depends { name: "multibundle"; }
Depends { name: "VGAnalyticsLib" } Depends { name: "VGAnalyticsLib" }
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages }
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: "Tape" name: "Tape"
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Tape" : "tape" buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Tape" : "tape"

5
src/libs/ifc/ifc.qbs
View File

@ -98,9 +98,10 @@ VLib {
Export { Export {
Depends { name: "cpp" } Depends { name: "cpp" }
Depends { name: "Qt"; submodules: ["xml"] } Depends { name: "Qt"; submodules: ["core", "xml"] }
Depends { name: "VMiscLib" } Depends { name: "VMiscLib" }
Depends { name: "conan.XercesC"; condition: buildconfig.useConanPackages } 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 }
cpp.includePaths: [exportingProduct.sourceDirectory] cpp.includePaths: [exportingProduct.sourceDirectory]
} }
} }