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

Help qbs to detect compiler type.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-23 11:12:42 +02:00
parent 1b71ceb5cd
commit dd3afe808e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appveyor.yml
View File

@ -331,16 +331,15 @@ for:
- qbs setup-qt %QTDIR%\bin\qmake.exe qt6 - qbs setup-qt %QTDIR%\bin\qmake.exe qt6
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- dir "C:\Qt\Tools" - dir "C:\Qt\Tools"
- dir "C:\Qt\Tools\mingw1120_64\bin"
- ps: | - ps: |
if ($env:COMPILER -eq "msvc") if ($env:COMPILER -eq "msvc")
{ {
& qbs.exe setup-toolchains $env:MSVC_PATH\cl.exe $env:COMPILER & qbs.exe setup-toolchains $env:MSVC_PATH\cl.exe --type msvc $env:COMPILER
& qbs.exe config profiles.qt6.baseProfile $env:COMPILER & qbs.exe config profiles.qt6.baseProfile $env:COMPILER
} }
else else
{ {
& qbs.exe setup-toolchains $env:MINGW_PATH\g++.exe $env:COMPILER & qbs.exe setup-toolchains $env:MINGW_PATH\g++.exe --type mingw $env:COMPILER
& qbs.exe config profiles.qt6.baseProfile $env:COMPILER & qbs.exe config profiles.qt6.baseProfile $env:COMPILER
} }
- qbs config --list profiles - qbs config --list profiles
@ -459,6 +458,7 @@ for:
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
init: init:
- find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
- sudo xcode-select -p - sudo xcode-select -p
- sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app - sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app
- brew update > /dev/null - brew update > /dev/null
@ -500,6 +500,7 @@ for:
- job_name: MacOS_10_15_Qt_5_15 (make) - job_name: MacOS_10_15_Qt_5_15 (make)
init: init:
- find /Applications -maxdepth 1 -type d -name 'Xcode*.ap
- sudo xcode-select -p - sudo xcode-select -p
- sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app - sudo xcode-select -s /Applications/Xcode_$XCODE_VERSION.app
- clang --version - clang --version