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

Always install conan on macos with qbs.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-03-07 09:50:45 +02:00
parent 2dff4162b7
commit 84990ca08d
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
appveyor.yml
View File

@ -100,7 +100,6 @@ environment:
PLATFORM: "macOS_11+" PLATFORM: "macOS_11+"
MACOS_DEPLOYMENT_TARGET: 11.0 MACOS_DEPLOYMENT_TARGET: 11.0
MULTI_BUNDLE: true MULTI_BUNDLE: true
ENABLE_CONAN: true
DEPLOY: true DEPLOY: true
- job_name: MacOS_12_Qt_6_4 (singlebundle) - job_name: MacOS_12_Qt_6_4 (singlebundle)
@ -114,7 +113,6 @@ environment:
PLATFORM: "macOS_11+" PLATFORM: "macOS_11+"
MACOS_DEPLOYMENT_TARGET: 11.0 MACOS_DEPLOYMENT_TARGET: 11.0
MULTI_BUNDLE: false MULTI_BUNDLE: false
ENABLE_CONAN: true
DEPLOY: true DEPLOY: true
- job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, multibundle)
@ -128,7 +126,6 @@ environment:
PLATFORM: "macOS10.13+" PLATFORM: "macOS10.13+"
MACOS_DEPLOYMENT_TARGET: 10.13 MACOS_DEPLOYMENT_TARGET: 10.13
MULTI_BUNDLE: true MULTI_BUNDLE: true
ENABLE_CONAN: false
DEPLOY: true DEPLOY: true
- job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle) - job_name: MacOS_10_15_Qt_5_15 (qbs, singlebundle)
@ -142,7 +139,6 @@ environment:
PLATFORM: "macOS10.13+" PLATFORM: "macOS10.13+"
MACOS_DEPLOYMENT_TARGET: 10.13 MACOS_DEPLOYMENT_TARGET: 10.13
MULTI_BUNDLE: false MULTI_BUNDLE: false
ENABLE_CONAN: false
DEPLOY: true DEPLOY: true
- job_name: Windows_Qt_5_15_(make_GCC_x86) - job_name: Windows_Qt_5_15_(make_GCC_x86)
@ -556,12 +552,8 @@ for:
- export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH" - export PATH="$QTDIR/bin:$HOME/.local/bin:`python3 -m site --user-base`/bin:${HOME}/Qt/Qt Creator.app/Contents/MacOS:$PATH"
- echo $PATH - echo $PATH
- python3 --version - python3 --version
- | - pip3 install --user --upgrade pip dropbox conan==1.59
if [[ "$ENABLE_CONAN" == "true" ]]; then - conan --version
pip3 install --user --upgrade conan==1.59;
conan --version
fi
- pip3 install --user --upgrade pip dropbox
- clang --version - clang --version
- qmake --version - qmake --version
- which qmake - which qmake
@ -572,10 +564,7 @@ for:
build_script: build_script:
- pwd - pwd
- | - conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
if [[ "$ENABLE_CONAN" == "true" ]]; then
conan install . -s os=Macos -s os.version=${MACOS_DEPLOYMENT_TARGET} --build=missing
fi
- qbs setup-toolchains --detect - qbs setup-toolchains --detect
- qbs config --list profiles - qbs config --list profiles
- qbs setup-qt ${QTDIR}/bin/qmake qt6 - qbs setup-qt ${QTDIR}/bin/qmake qt6