diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs index 204e23040..630a9650c 100644 --- a/src/app/puzzle/puzzle.qbs +++ b/src/app/puzzle/puzzle.qbs @@ -17,6 +17,12 @@ VToolApp { targetName: buildconfig.appTarget multibundle.targetApps: ["Valentina"] + Properties { + condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle + conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath + conan.XercesC.installLib: true + } + files: [ "main.cpp", "vpapplication.cpp", diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index 4a8321e20..85f610d4f 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -21,6 +21,12 @@ VToolApp { targetName: buildconfig.appTarget multibundle.targetApps: ["Valentina"] + Properties { + condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle + conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath + conan.XercesC.installLib: true + } + files: [ "main.cpp", "tmainwindow.cpp", diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index 8e87587cd..fc2a32a0c 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -32,6 +32,12 @@ VToolApp { buildconfig.appTarget: qbs.targetOS.contains("macos") ? "Valentina" : "valentina" targetName: buildconfig.appTarget + Properties { + condition: buildconfig.useConanPackages + conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath + conan.XercesC.installLib: true + } + files: [ "main.cpp", "mainwindow.cpp", diff --git a/src/libs/ifc/ifc.qbs b/src/libs/ifc/ifc.qbs index 6f0c63609..b889a77d6 100644 --- a/src/libs/ifc/ifc.qbs +++ b/src/libs/ifc/ifc.qbs @@ -19,11 +19,6 @@ VLib { 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" files: [ "ifcdef.h",