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

Define profile when we build xerces-c on Windows.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-25 12:19:15 +02:00
parent 6e03722250
commit 079128630b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -179,7 +179,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
build_script: build_script:
- pwd - pwd
- conan profile detect - conan profile detect
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4 - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/[~3.2]
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs config --list profiles - qbs config --list profiles
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6

5
appveyor.yml
View File

@ -383,10 +383,11 @@ for:
"@ "@
} }
$profile | Out-File -FilePath "$env:HOMEPATH\.conan2\profiles\valentina" $profile | Out-File -FilePath "$env:HOMEPATH\.conan2\profiles\valentina"
- conan profile show -pr valentina
- qbs-config --list profiles - qbs-config --list profiles
build_script: build_script:
- conan install . -s os=Windows --build=xerces-c/3.2.4 - conan install . -s os=Windows --build=xerces-c/[~3.2] -pr valentina
- qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:[valentina] - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --command-echo-mode command-line config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:[valentina]
test_script: test_script:
@ -532,7 +533,7 @@ for:
- pwd - pwd
- | - |
if [[ "$ENABLE_CONAN" == "true" ]]; then if [[ "$ENABLE_CONAN" == "true" ]]; then
conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/3.2.4 conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c/[~3.2]
fi fi
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs config --list profiles - qbs config --list profiles