mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-16 02:25:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfixed appveyor.yml script

Browse Source
This commit is contained in:
jkriege2 2019-06-21 13:51:32 +02:00
parent fb5b497356
commit 0399a41ec9
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
appveyor.yml
View File

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