From bd10ac3c1356bc17514cd647ee821629e22cbea4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 4 Mar 2023 09:24:39 +0200 Subject: [PATCH] Fix copying conan package library on Windows. On Windows dll in bin folder, while on Unix it in lib. --- src/app/puzzle/puzzle.qbs | 2 +- src/app/tape/tape.qbs | 2 +- src/app/valentina/valentina.qbs | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/app/puzzle/puzzle.qbs b/src/app/puzzle/puzzle.qbs index 630a9650c..f38b94212 100644 --- a/src/app/puzzle/puzzle.qbs +++ b/src/app/puzzle/puzzle.qbs @@ -18,7 +18,7 @@ VToolApp { multibundle.targetApps: ["Valentina"] Properties { - condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle + condition: buildconfig.useConanPackages && qbs.targetOS.contains("macos") && buildconfig.enableMultiBundle conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath conan.XercesC.installLib: true } diff --git a/src/app/tape/tape.qbs b/src/app/tape/tape.qbs index 85f610d4f..4fdcf7ec6 100644 --- a/src/app/tape/tape.qbs +++ b/src/app/tape/tape.qbs @@ -22,7 +22,7 @@ VToolApp { multibundle.targetApps: ["Valentina"] Properties { - condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle + condition: buildconfig.useConanPackages && qbs.targetOS.contains("macos") && buildconfig.enableMultiBundle conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath conan.XercesC.installLib: true } diff --git a/src/app/valentina/valentina.qbs b/src/app/valentina/valentina.qbs index fc2a32a0c..ecbe58894 100644 --- a/src/app/valentina/valentina.qbs +++ b/src/app/valentina/valentina.qbs @@ -33,9 +33,19 @@ VToolApp { targetName: buildconfig.appTarget Properties { - condition: buildconfig.useConanPackages + condition: buildconfig.useConanPackages && (qbs.targetOS.contains("windows") || qbs.targetOS.contains("macos")) conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath - conan.XercesC.installLib: true + conan.XercesC.binInstallDir: qbs.installPrefix + "/" + buildconfig.installBinaryPath + conan.XercesC.installLib: { + if (qbs.targetOS.contains("windows")) + return false + return true + } + conan.XercesC.installBin: { + if (qbs.targetOS.contains("windows")) + return true + return false + } } files: [