mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2025-02-03 11:09:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jkriege2/JKQtPlotter

Browse Source
This commit is contained in:
jkriege2 2022-04-17 12:57:17 +02:00
commit f17c29e2c8
1 changed files with 81 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
appveyor.yml
View File

@ -25,46 +25,66 @@ environment:
USE_CMAKE: true USE_CMAKE: true
matrix: matrix:
- image: Visual Studio 2015 #- QTABI: mingw53_32
QTABI: mingw53_32 # COMPILER: MinGW
COMPILER: MinGW # MINGWDIR: C:\Qt\Tools\mingw530_32
MINGWDIR: C:\Qt\Tools\mingw530_32 # QTVER: 5.11
QTVER: 5.11 # MAKETOOL: mingw32-make
MAKETOOL: mingw32-make # CMAKE_GENERATOR: "MinGW Makefiles"
CMAKE_GENERATOR: "MinGW Makefiles"
- image: Visual Studio 2015 #- QTABI: msvc2015
QTABI: msvc2015_64 # COMPILER: MSVC
COMPILER: MSVC # QTVER: 5.11
QTVER: 5.11 # CMAKE_GENERATOR: "Visual Studio 14 2015"
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
- image: Visual Studio 2015
QTABI: msvc2015
COMPILER: MSVC
QTVER: 5.11
CMAKE_GENERATOR: "Visual Studio 15 2017"
- image: Visual Studio 2022 - QTABI: msvc2019_64
QTABI: msvc2019_64 COMPILER: MSVC
COMPILER: MSVC
QTVER: 5.15 QTVER: 5.15
CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" CMAKE_GENERATOR: "Visual Studio 16 2019 Win64"
- image: Visual Studio 2022 - QTABI: mingw81_64
QTABI: mingw81_64 COMPILER: MinGW
COMPILER: MinGW
MINGWDIR: C:\Qt\Tools\mingw810_64 MINGWDIR: C:\Qt\Tools\mingw810_64
QTVER: 5.15 QTVER: 5.15
CMAKE_GENERATOR: "Visual Studio 16 2019 Win64" CMAKE_GENERATOR: "Visual Studio 16 2019 Win64"
- image: Ubuntu2004 - QTABI: gcc_64
QTABI: gcc_64 COMPILER: GCC
COMPILER: gcc
QTVER: 5.15 QTVER: 5.15
CMAKE_GENERATOR: "Unix Makefiles" CMAKE_GENERATOR: "Unix Makefiles"
image:
# AppVeyor builds are ordered by the image list:
#- Visual Studio 2017
- Visual Studio 2019
- Ubuntu2004
matrix:
exclude:
# Exclude invalid options
- image: Visual Studio 2019
QTABI: gcc_64
- image: Visual Studio 2019
QTABI: mingw53_32
- image: Visual Studio 2019
QTABI: msvc2015
- image: Visual Studio 2017
QTABI: gcc_64
- image: Visual Studio 2017
QTABI: msvc2019_64
- image: Visual Studio 2017
QTABI: mingw81_64
- image: Ubuntu2004
QTABI: mingw81_64
- image: Ubuntu2004
QTABI: msvc2019_64
- image: Ubuntu2004
QTABI: msvc2015_64
- image: Ubuntu2004
QTABI: msvc2015
- image: Ubuntu2004
QTABI: mingw53_32
for: for:
# Windows (MinGW 5.3 & MSVC2015) # Windows (MinGW 5.3 & MSVC2015)
@ -106,16 +126,16 @@ for:
- cmd: echo == BUILD JKQtPlotter ============================================================================ - cmd: echo == BUILD JKQtPlotter ============================================================================
- cmd: mkdir build - cmd: mkdir build
- cmd: cd build - cmd: cd build
- cmd: if [%USE_CMAKE%]==[true] echo "--- Run CMake Configure -----------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[true] cmake --version && - cmd: if %USE_CMAKE%==true cmake --version &&
- cmd: if [%USE_CMAKE%]==[true] cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. &&
- cmd: if [%USE_CMAKE%]==[true] echo "--- Build using CMake -------------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[true] cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% )
- cmd: if [%USE_CMAKE%]==[false] echo "--- Run QMake Configure -----------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[false] qmake.exe -v && - cmd: if %USE_CMAKE%==false qmake.exe -v &&
- cmd: if [%USE_CMAKE%]==[false] qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro &&
- cmd: if [%USE_CMAKE%]==[false] echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[false] call %MAKETOOL% && - cmd: if %USE_CMAKE%==false call %MAKETOOL% &&
- cmd: cd .. - cmd: cd ..
@ -159,16 +179,16 @@ for:
- cmd: echo == BUILD JKQtPlotter ============================================================================ - cmd: echo == BUILD JKQtPlotter ============================================================================
- cmd: mkdir build - cmd: mkdir build
- cmd: cd build - cmd: cd build
- cmd: if [%USE_CMAKE%]==[true] echo "--- Run CMake Configure -----------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[true] cmake --version && - cmd: if %USE_CMAKE%==true cmake --version &&
- cmd: if [%USE_CMAKE%]==[true] cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. &&
- cmd: if [%USE_CMAKE%]==[true] echo "--- Build using CMake -------------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[true] cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% )
- cmd: if [%USE_CMAKE%]==[false] echo "--- Run QMake Configure -----------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[false] qmake.exe -v && - cmd: if %USE_CMAKE%==false qmake.exe -v &&
- cmd: if [%USE_CMAKE%]==[false] qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro && - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro &&
- cmd: if [%USE_CMAKE%]==[false] echo "--- Build using MAKETOOL ----------------------------------------------------------------------------" && #- cmd: if %USE_CMAKE%==false echo --- Build using MAKETOOL ---------------------------------------------------------------------------- &&
- cmd: if [%USE_CMAKE%]==[false] call %MAKETOOL% && - cmd: if %USE_CMAKE%==false call %MAKETOOL% &&
- cmd: cd .. - cmd: cd ..
@ -184,29 +204,28 @@ for:
init: init:
- sh: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - sh: echo == INIT SYSTEM ENVIRONMENT ======================================================================
- sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN) - sh: echo _NPROCESSORS_ONLN=$(getconf _NPROCESSORS_ONLN)
- sh: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% - sh: echo APPVEYOR_BUILD_WORKER_IMAGE=$APPVEYOR_BUILD_WORKER_IMAGE
- sh: echo QTABI=%QTABI% - sh: echo QTABI=$QTABI
- sh: echo CMAKE_GENERATOR=%CMAKE_GENERATOR% - sh: echo CMAKE_GENERATOR=$CMAKE_GENERATOR
install: install:
# Init compiler environment # Init compiler environment
- sh: echo == INIT COMPILER ENVIRONMENT ==================================================================== - sh: echo == INIT COMPILER ENVIRONMENT ====================================================================
- sh: set QTDIR=$HOME/Qt/%QTVER%/%QTABI%/bin - sh: set QTDIR=$HOME/Qt/$QTVER/$QTABI/bin
- sh: sudo apt update -qq - sh: sudo apt update -qq
- sh: sudo apt install -y build-essential git qt5-qmake cmake ninja-build - sh: sudo apt install -y build-essential git qt5-qmake cmake
- sh: echo QTDIR=%QTDIR% - sh: echo QTDIR=$QTDIR
- sh: echo PATH=%PATH% - sh: echo PATH=$PATH
- sh: echo == INSTALL OPENCV =============================================================================== - sh: echo == INSTALL OPENCV ===============================================================================
# Install OpenCV # Install OpenCV
- sh: sudo apt install -y opencv - sh: sudo apt install -y libopencv-dev
- sh: echo OPENCV_DIR=%OPENCV_DIR%
build_script: build_script:
- sh: echo == BUILD JKQtPlotter ============================================================================ - sh: echo == BUILD JKQtPlotter ============================================================================
- sh: mkdir build - sh: mkdir build
- sh: cd build - sh: cd build
- sh: echo "--- Run CMake Configure -----------------------------------------------------------------------------" && - sh: echo --- Run CMake Configure -----------------------------------------------------------------------------
- sh: cmake --version && - sh: cmake --version
- sh: cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%" .. && - sh: cmake -G "$CMAKE_GENERATOR" ..
- sh: echo "--- Build using CMake -------------------------------------------------------------------------------" && - sh: echo --- Build using CMake -------------------------------------------------------------------------------
- sh: cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS )