Update appveyor.yml

This commit is contained in:
Jan W. Krieger 2022-07-20 12:34:14 +02:00 committed by GitHub
parent a132482f7b
commit 64d6b1d08f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,7 +25,9 @@ environment:
global:
JOMDIR: C:\Qt\Tools\QtCreator\bin
VSVER: 0
MAKETOOL: make # or $JOMDIR\jom
CMAKE_BUILDFLAGS:
BUILDFLAGS:
USE_CMAKE: true
matrix:
@ -37,6 +39,7 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
CMAKE_GENERATOR: "Unix Makefiles"
MAKETOOL: make
BUILDFLAGS: -j$(getconf _NPROCESSORS_ONLN)
- QTABI: msvc2019_64
COMPILER: MSVC
@ -168,19 +171,21 @@ for:
- sh: echo == BUILD JKQtPlotter ============================================================================
- sh: mkdir build
- sh: cd build
- sh: if [ "$USE_CMAKE" = true ]; then
- sh: |
if [ "$USE_CMAKE" = true ]; then
echo --- Run CMake Configure -----------------------------------------------------------------------------
cmake --version
cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" ..
echo --- Build using CMake -------------------------------------------------------------------------------
cmake --build . --config "$CONFIGURATION" -j$(getconf _NPROCESSORS_ONLN) -- $CMAKE_BUILDFLAGS
fi
- sh: if [ "$USE_CMAKE" = false ]; then
- sh: |
if [ "$USE_CMAKE" = false ]; then
echo --- Run QMake Configure -----------------------------------------------------------------------------
qmake -v
qmake CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro
echo --- Build using QMake -------------------------------------------------------------------------------
Make -j$(getconf _NPROCESSORS_ONLN)
qmake -makefile -o Makefile CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro
echo --- Build for QMake ---------------------------------------------------------------------------------
$MAKETOOL $BUILDFLAGS
fi