bugfixed appveyor.yml script

This commit is contained in:
jkriege2 2019-06-21 13:51:32 +02:00
parent fb5b497356
commit 0399a41ec9

View File

@ -8,41 +8,44 @@ environment:
QTVER: 5.11
JOMDIR: C:\Qt\Tools\QtCreator\bin
MINGWDIR: C:\Qt\Tools\mingw530_32
MSBUILD_FLAGS: /verbosity:minimal /maxcpucount
matrix:
- QTABI: msvc2017_64
ARCH: x64
VSVER: 2017
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
RUN_CMAKE: 1
USE_CMAKE: true
MSBUILD_FLAGS: /verbosity:minimal /maxcpucount
- QTABI: msvc2017_64
ARCH: x64
VSVER: 2017
QMAKESPEC: win32-msvc
MAKETOOL: jom
RUN_CMAKE: 0
USE_CMAKE: false
- QTABI: msvc2015
ARCH: x86
VSVER: 14
CMAKE_GENERATOR: "Visual Studio 15 2017"
RUN_CMAKE: 1
USE_CMAKE: true
MSBUILD_FLAGS: /verbosity:minimal /maxcpucount
- QTABI: msvc2015
ARCH: x86
VSVER: 14
QMAKESPEC: win32-msvc
MAKETOOL: jom
RUN_CMAKE: 0
USE_CMAKE: false
- QTABI: mingw53_32
ARCH: x86
MAKETOOL: mingw32-make
CMAKE_GENERATOR: "MinGW Makefiles"
RUN_CMAKE: 1
USE_CMAKE: true
MSBUILD_FLAGS:
- QTABI: mingw53_32
ARCH: x86
QMAKESPEC: win32-g++
MAKETOOL: mingw32-make
RUN_CMAKE: 0
USE_CMAKE: false
skip_tags: true
@ -74,19 +77,20 @@ build_script:
# - type "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\INCLUDE\random"
- mkdir build
- cd build
- IF %RUN_CMAKE% == 1 (
- if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=Release) else (set CMAKE_CONFIGURATION=Debug)
- if [%USE_CMAKE%]==[true] (
echo "Call CMake..."
if "%CONFIGURATION%"=="release" (set CMAKE_CONFIGURATION=RelWithDebInfo) else (set CMAKE_CONFIGURATION=Debug)
cmake -H. -Bbuild -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QT5%"
echo "Build..."
cmake --build build --config "%CMAKE_CONFIGURATION%" -- %MSBUILD_FLAGS%
) ELSE (
echo "Call QMake..."
qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro
echo "Build..."
call %MAKETOOL%
cd ..
)
cmake --version &&
cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QT5%" .. &&
echo "Build..." &&
cmake --build --config "%CMAKE_CONFIGURATION%" -- %MSBUILD_FLAGS% )
else (
echo "Call QMake..." &&
qmake.exe -v &&
qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro &&
echo "Build..." &&
call %MAKETOOL% &&
cd ..)
#artifacts:
# - path: build\staticlib\**\*.a