From 146a9d3d2b8c9fdff28edbc15759f0f0deec7f6d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 29 Aug 2023 15:35:48 +0300 Subject: [PATCH] Switch to using qbspkgconfig. --- .cirrus.yml | 4 +--- appveyor.yml | 4 +--- valentina.qbs | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 0773b2747..e0e566744 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -188,8 +188,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE - echo $PATH - chmod -R 755 /opt/homebrew/opt/qt6/* - chmod -R 755 /opt/homebrew/opt/openssl@1.1/* - - export PKG_CONFIG_PATH="$(brew --prefix qt6)/lib/pkgconfig:$(brew --prefix openssl@1.1)/lib/pkgconfig" - - echo $PKG_CONFIG_PATH - python3 --version - pip3 install --user --upgrade pip dropbox conan==1.60 - ccache --set-config=sloppiness=pch_defines,time_macros @@ -216,7 +214,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 - qbs-config defaultProfile qt6 - qbs config profiles.qt6.baseProfile clang - - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} project.conanProfiles:valentina + - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:${ENABLE_CCACHE} project.conanProfiles:valentina moduleProvides.qbspkgconfig.extraPaths:$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig - ccache -s deploy_script: - pwd diff --git a/appveyor.yml b/appveyor.yml index 6a641efc4..91659a88a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -655,8 +655,6 @@ for: ) 2>&1 | sed 's/^/CACHE: /' & fi - - export PKG_CONFIG_PATH="$(brew --prefix openssl@1.1)/lib/pkgconfig"; - sudo python3 -m pip install --upgrade pip - pip3 install --user --upgrade pip dropbox conan==1.60 - conan --version @@ -674,7 +672,7 @@ for: - qbs setup-qt ${QTDIR}/bin/qmake qt6 - qbs config defaultProfile qt6 - qbs config profiles.qt6.baseProfile clang - - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false + - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:false moduleProvides.qbspkgconfig.extraPaths:$(brew --prefix openssl@1.1)/lib/pkgconfig deploy_script: - CIRRUS_WORKING_DIR=${APPVEYOR_BUILD_FOLDER} CIRRUS_CHANGE_IN_REPO=${APPVEYOR_REPO_COMMIT} CIRRUS_BRANCH=${APPVEYOR_REPO_BRANCH} ${APPVEYOR_BUILD_FOLDER}/scripts/cirrus-deploy.sh diff --git a/valentina.qbs b/valentina.qbs index a69d78dc9..f6066d964 100644 --- a/valentina.qbs +++ b/valentina.qbs @@ -5,6 +5,7 @@ import "qbs/imports/conan/ConanfileProbe.qbs" as ConanfileProbe Project { name: "Valentina" minimumQbsVersion: "1.16" + qbsModuleProviders: ["Qt", "qbspkgconfig"] property bool enableConan: false property string minimumMacosVersion: undefined