Fix installing xerces-c library.
This commit is contained in:
parent
34632ebb43
commit
47bb2c16d4
|
@ -17,6 +17,12 @@ VToolApp {
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
multibundle.targetApps: ["Valentina"]
|
multibundle.targetApps: ["Valentina"]
|
||||||
|
|
||||||
|
Properties {
|
||||||
|
condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle
|
||||||
|
conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
|
||||||
|
conan.XercesC.installLib: true
|
||||||
|
}
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"main.cpp",
|
"main.cpp",
|
||||||
"vpapplication.cpp",
|
"vpapplication.cpp",
|
||||||
|
|
|
@ -21,6 +21,12 @@ VToolApp {
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
multibundle.targetApps: ["Valentina"]
|
multibundle.targetApps: ["Valentina"]
|
||||||
|
|
||||||
|
Properties {
|
||||||
|
condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle
|
||||||
|
conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
|
||||||
|
conan.XercesC.installLib: true
|
||||||
|
}
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"main.cpp",
|
"main.cpp",
|
||||||
"tmainwindow.cpp",
|
"tmainwindow.cpp",
|
||||||
|
|
|
@ -32,6 +32,12 @@ VToolApp {
|
||||||
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina"
|
buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina"
|
||||||
targetName: buildconfig.appTarget
|
targetName: buildconfig.appTarget
|
||||||
|
|
||||||
|
Properties {
|
||||||
|
condition: buildconfig.useConanPackages
|
||||||
|
conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
|
||||||
|
conan.XercesC.installLib: true
|
||||||
|
}
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"main.cpp",
|
"main.cpp",
|
||||||
"mainwindow.cpp",
|
"mainwindow.cpp",
|
||||||
|
|
|
@ -19,11 +19,6 @@ VLib {
|
||||||
condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
|
condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 && buildconfig.useConanPackages
|
||||||
}
|
}
|
||||||
|
|
||||||
Properties {
|
|
||||||
condition: buildconfig.useConan && (qbs.targetOS.contains("macos") || qbs.targetOS.contains("windows"))
|
|
||||||
conan.XercesC.installLib: true
|
|
||||||
}
|
|
||||||
|
|
||||||
name: "IFCLib"
|
name: "IFCLib"
|
||||||
files: [
|
files: [
|
||||||
"ifcdef.h",
|
"ifcdef.h",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user