From 597c0d6d6d902a1493eb439e78ba3a537f4fc8cd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 6 Mar 2023 16:34:39 +0200 Subject: [PATCH] Build xerces-c only if missing. --- .cirrus.yml | 2 +- appveyor.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 56ff1ceca..8b42fe285 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -184,7 +184,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH" - echo $PATH - pwd - - 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=missing - qbs setup-toolchains --detect - qbs config --list profiles - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 diff --git a/appveyor.yml b/appveyor.yml index 36fcfbcf8..386db36f9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -420,7 +420,7 @@ for: - qbs-config --list profiles build_script: - - conan install . -s os=Windows --build=xerces-c/3.2.4 -pr valentina + - conan install . -s os=Windows --build=missing -pr valentina - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% test_script: @@ -574,7 +574,7 @@ for: - pwd - | 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=missing fi - qbs setup-toolchains --detect - qbs config --list profiles