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

Fix copying conan package library on Windows.

Browse Source 
On Windows dll in bin folder, while on Unix it in lib.
This commit is contained in:
Roman Telezhynskyi 2023-03-04 09:24:39 +02:00
parent 5ceff228eb
commit bd10ac3c13
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/puzzle/puzzle.qbs
View File

@ -18,7 +18,7 @@ VToolApp {
multibundle.targetApps: ["Valentina"] multibundle.targetApps: ["Valentina"]
Properties { Properties {
condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle condition: buildconfig.useConanPackages && qbs.targetOS.contains("macos") && buildconfig.enableMultiBundle
conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
conan.XercesC.installLib: true conan.XercesC.installLib: true
} }

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

@ -22,7 +22,7 @@ VToolApp {
multibundle.targetApps: ["Valentina"] multibundle.targetApps: ["Valentina"]
Properties { Properties {
condition: buildconfig.useConanPackages && buildconfig.enableMultiBundle condition: buildconfig.useConanPackages && qbs.targetOS.contains("macos") && buildconfig.enableMultiBundle
conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath
conan.XercesC.installLib: true conan.XercesC.installLib: true
} }

14
src/app/valentina/valentina.qbs
View File

@ -33,9 +33,19 @@ VToolApp {
targetName: buildconfig.appTarget targetName: buildconfig.appTarget
Properties { Properties {
condition: buildconfig.useConanPackages condition: buildconfig.useConanPackages && (qbs.targetOS.contains("windows") || qbs.targetOS.contains("macos"))
conan.XercesC.libInstallDir: qbs.installPrefix + "/" + buildconfig.installLibraryPath 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: [ files: [