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

Create a default conan profile.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-24 15:56:20 +02:00
parent fdb8fc8f1f
commit 6a7d9c82d6
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cirrus.yml
View File

@ -176,6 +176,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- qbs --version - qbs --version
build_script: build_script:
- pwd - pwd
- conan profile detect
- conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=xerces-c
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs config --list profiles - qbs config --list profiles

13
appveyor.yml
View File

@ -258,6 +258,16 @@ matrix:
job_name: Windows_Qt_5_15_(qbs_MSVC_x64) job_name: Windows_Qt_5_15_(qbs_MSVC_x64)
- platform: x86 - platform: x86
job_name: Windows_Qt_5_6_(MSVC_x64) 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 - platform: x64
job_name: Windows_Qt_5_15_(make_GCC_x86) job_name: Windows_Qt_5_15_(make_GCC_x86)
- platform: x64 - platform: x64
@ -342,7 +352,8 @@ for:
& qbs-setup-toolchains.exe --type mingw $env:MINGW_PATH\g++.exe $env:COMPILER & qbs-setup-toolchains.exe --type mingw $env:MINGW_PATH\g++.exe $env:COMPILER
& qbs-config.exe profiles.qt6.baseProfile $env:COMPILER & qbs-config.exe profiles.qt6.baseProfile $env:COMPILER
} }
- qbs-config --list profiles - qbs-config --list profiles
- conan profile detect
build_script: 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 - 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

1
qbs/imports/conan/ConanfileProbe.qbs
View File

@ -111,7 +111,6 @@ Probe {
args = args.concat(["-of", generatedFilesPath]); args = args.concat(["-of", generatedFilesPath]);
var p = new Process(); var p = new Process();
console.info(args);
p.start(executable, args); p.start(executable, args);
while (!p.waitForFinished(500)) { while (!p.waitForFinished(500)) {
const output = p.readStdOut(); const output = p.readStdOut();