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

Fixes.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-25 11:07:15 +02:00
parent 03603ff7f5
commit a558a788ae
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
appveyor.yml
View File

@ -346,23 +346,22 @@ for:
- dir "C:\Qt\Tools" - dir "C:\Qt\Tools"
- conan config home - conan config home
- type %HOMEPATH%\.conan2\settings.yml - type %HOMEPATH%\.conan2\settings.yml
- conan profile detect --name valentina
- ps: | - ps: |
if ($env:ARCH -eq "x64") { if ($env:ARCH -eq "x64") {
$arch="arch=x86_64" $arch="arch=x86_64"
} else { } else {
$arch="arch=x86" $arch="arch=x86"
} }
if ($env:COMPILER -eq "msvc") if ($env:COMPILER -eq "msvc")
{ {
& qbs-setup-toolchains.exe --type msvc $env:MSVC_PATH\cl.exe $env:COMPILER & qbs-setup-toolchains.exe --type msvc $env:MSVC_PATH\cl.exe $env:COMPILER
& qbs-config.exe profiles.qt6.baseProfile $env:COMPILER & qbs-config.exe profiles.qt6.baseProfile $env:COMPILER
$profile = @" $profile = @"
[settings] [settings]
build_type=Release build_type=Release
compiler=msvc compiler=msvc
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release compiler.runtime_type=Release
compiler.version=192 compiler.version=192
os=Windows os=Windows
@ -373,7 +372,6 @@ 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
$profile = @" $profile = @"
[settings] [settings]
build_type=Release build_type=Release
@ -385,9 +383,7 @@ for:
$arch $arch
"@ "@
} }
$profile | Out-File -FilePath "$env:HOMEPATH\.conan2\profiles\valentina" $profile | Out-File -FilePath "$env:HOMEPATH\.conan2\profiles\valentina"
- qbs-config --list profiles - qbs-config --list profiles
build_script: build_script:
@ -512,6 +508,8 @@ for:
- brew update > /dev/null - brew update > /dev/null
- rm '/usr/local/bin/ccmake' - rm '/usr/local/bin/ccmake'
- rm '/usr/local/bin/cmake' - rm '/usr/local/bin/cmake'
- rm '/usr/local/bin/cpack'
- rm '/usr/local/bin/ctest'
- brew install --force coreutils qbs cmake - brew install --force coreutils qbs cmake
- | - |
if [[ "$ENABLE_CONAN" == "true" ]]; then if [[ "$ENABLE_CONAN" == "true" ]]; then