From 6a7d9c82d6a53f09eac904449844c3fec87e5f93 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 24 Feb 2023 15:56:20 +0200 Subject: [PATCH] Create a default conan profile. --- .cirrus.yml | 1 + appveyor.yml | 13 ++++++++++++- qbs/imports/conan/ConanfileProbe.qbs | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index a0e3871fa..efcdcbc05 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -176,6 +176,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE - qbs --version build_script: - pwd + - conan profile detect - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c - qbs setup-toolchains --detect - qbs config --list profiles diff --git a/appveyor.yml b/appveyor.yml index 87216bf52..faac98751 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -258,6 +258,16 @@ matrix: job_name: Windows_Qt_5_15_(qbs_MSVC_x64) - platform: x86 job_name: Windows_Qt_5_6_(MSVC_x64) + - platform: x86 + job_name: MacOS_12_Qt_6_4 (multibundle) + - platform: x86 + job_name: MacOS_12_Qt_6_4 (singlebundle) + - platform: x86 + job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle) + - platform: x86 + job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) + - platform: x86 + job_name: MacOS_10_15_Qt_5_15 (make) - platform: x64 job_name: Windows_Qt_5_15_(make_GCC_x86) - platform: x64 @@ -342,7 +352,8 @@ for: & qbs-setup-toolchains.exe --type mingw $env:MINGW_PATH\g++.exe $env:COMPILER & qbs-config.exe profiles.qt6.baseProfile $env:COMPILER } - - qbs-config --list profiles + - qbs-config --list profiles + - conan profile detect build_script: - 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 diff --git a/qbs/imports/conan/ConanfileProbe.qbs b/qbs/imports/conan/ConanfileProbe.qbs index e5b11ca7e..21c3e153c 100644 --- a/qbs/imports/conan/ConanfileProbe.qbs +++ b/qbs/imports/conan/ConanfileProbe.qbs @@ -111,7 +111,6 @@ Probe { args = args.concat(["-of", generatedFilesPath]); var p = new Process(); - console.info(args); p.start(executable, args); while (!p.waitForFinished(500)) { const output = p.readStdOut();