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

fixed appveyor.yml (syntax, added CImg ...)

Browse Source
This commit is contained in:
jkriege2 2022-04-17 13:49:29 +02:00
parent 33563bd379
commit ea30cbbcdd
1 changed files with 41 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
appveyor.yml
View File

@ -21,33 +21,22 @@ environment:
global: global:
JOMDIR: C:\Qt\Tools\QtCreator\bin JOMDIR: C:\Qt\Tools\QtCreator\bin
VSVER: 0 VSVER: 0
CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount CMAKE_BUILDFLAGS:
USE_CMAKE: true USE_CMAKE: true
matrix: matrix:
#- QTABI: mingw53_32
# COMPILER: MinGW
# MINGWDIR: C:\Qt\Tools\mingw530_32
# QTVER: 5.11
# MAKETOOL: mingw32-make
# CMAKE_GENERATOR: "MinGW Makefiles"
#- QTABI: msvc2015
# COMPILER: MSVC
# QTVER: 5.11
# CMAKE_GENERATOR: "Visual Studio 14 2015"
- 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"
CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount
- QTABI: mingw81_64
COMPILER: MinGW
MINGWDIR: C:\Qt\Tools\mingw810_64
QTVER: 5.15
CMAKE_GENERATOR: "Visual Studio 16 2019 Win64"
# - QTABI: mingw81_64
# COMPILER: MinGW
# MINGWDIR: C:\Qt\Tools\mingw810_64
# QTVER: 5.15
# CMAKE_GENERATOR: "MinGW Makefiles"
#
- QTABI: gcc_64 - QTABI: gcc_64
COMPILER: GCC COMPILER: GCC
QTVER: 5.15 QTVER: 5.15
@ -55,7 +44,6 @@ environment:
image: image:
# AppVeyor builds are ordered by the image list: # AppVeyor builds are ordered by the image list:
#- Visual Studio 2017
- Visual Studio 2019 - Visual Studio 2019
- Ubuntu2004 - Ubuntu2004
@ -68,12 +56,6 @@ matrix:
QTABI: mingw53_32 QTABI: mingw53_32
- image: Visual Studio 2019 - image: Visual Studio 2019
QTABI: msvc2015 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 - image: Ubuntu2004
QTABI: mingw81_64 QTABI: mingw81_64
- image: Ubuntu2004 - image: Ubuntu2004
@ -87,65 +69,11 @@ matrix:
for: for:
# Windows (MinGW 5.3 & MSVC2015)
-
matrix:
only:
- image: Visual Studio 2019
init:
- cmd: echo == INIT SYSTEM ENVIRONMENT ======================================================================
- cmd: echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS%
- cmd: echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER%
- cmd: echo APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
- cmd: echo QTABI=%QTABI%
- cmd: echo CMAKE_GENERATOR=%CMAKE_GENERATOR%
- cmd: echo CMAKE_BUILDFLAGS=%CMAKE_BUILDFLAGS%
install:
# Init compiler environment
- cmd: echo == INIT COMPILER ENVIRONMENT ====================================================================
- cmd: set QTDIR=C:\Qt\%QTVER%\%QTABI%\bin
- cmd: set PATH=%QTDIR%;%JOMDIR%;%PATH%
- cmd: if %COMPILER%==MinGW set "PATH=%MINGWDIR%\bin;%PATH%"
- cmd: if %QTABI%==msvc2015 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
- cmd: if %QTABI%==msvc2015_64 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- cmd: if %QTABI%==msvc2015_64 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
# Rename sh.exe as sh.exe in PATH interferes with MinGW
- cmd: if %COMPILER%==MinGW rename "C:\Program Files\Git\usr\bin\sh.exe" "sh2.exe"
- cmd: echo QTDIR=%QTDIR%
- cmd: echo JOMDIR=%JOMDIR%
- cmd: echo PATH=%PATH%
- cmd: echo == INSTALL OPENCV ===============================================================================
# Install OpenCV
- cmd: choco install OpenCV
- cmd: set OPENCV_DIR=C:\tools\opencv\build
- cmd: echo OPENCV_DIR=%OPENCV_DIR%
build_script:
- cmd: echo == BUILD JKQtPlotter ============================================================================
- cmd: mkdir build
- cmd: cd build
#- cmd: if %USE_CMAKE%==true echo --- Run CMake Configure ----------------------------------------------------------------------------- &&
- 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 echo --- Build using CMake ------------------------------------------------------------------------------- &&
- 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 qmake.exe -v &&
- 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 call %MAKETOOL% &&
- cmd: cd ..
# Windows (MinGW 8.1 & MSVC2019) # Windows (MinGW 8.1 & MSVC2019)
- -
matrix: matrix:
only: only:
- image: Visual Studio 2022 - image: Visual Studio 2019
init: init:
- cmd: echo == INIT SYSTEM ENVIRONMENT ====================================================================== - cmd: echo == INIT SYSTEM ENVIRONMENT ======================================================================
@ -169,26 +97,30 @@ for:
- cmd: echo QTDIR=%QTDIR% - cmd: echo QTDIR=%QTDIR%
- cmd: echo JOMDIR=%JOMDIR% - cmd: echo JOMDIR=%JOMDIR%
- cmd: echo PATH=%PATH% - cmd: echo PATH=%PATH%
- cmd: echo == INSTALL OPENCV ===============================================================================
# Install OpenCV # Install OpenCV
- cmd: echo == INSTALL OPENCV ===============================================================================
- cmd: choco install OpenCV - cmd: choco install OpenCV
- cmd: set OPENCV_DIR=C:\tools\opencv\build - cmd: set OPENCV_DIR=C:\tools\opencv\build
- cmd: echo OPENCV_DIR=%OPENCV_DIR% - cmd: echo OPENCV_DIR=%OPENCV_DIR%
# Install CImg
- cmd: echo == INSTALL CIMG =================================================================================
- cmd: mkdir C:\tools\cimg
- cmd: git clone --depth=1 https://github.com/dtschump/CImg.git C:\tools\cimg
- cmd: set CIMG_DIR=C:\tools\cimg
- cmd: echo CIMG_DIR=%CIMG_DIR%
- cmd: set CIMG_INCLUDE_DIR=C:\tools\cimg
- cmd: echo CIMG_INCLUDE_DIR=%CIMG_INCLUDE_DIR%
build_script: build_script:
- 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 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 cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS%
#- cmd: if %USE_CMAKE%==true echo --- Build using CMake ------------------------------------------------------------------------------- && - cmd: if %USE_CMAKE%==false qmake.exe -v
- cmd: if %USE_CMAKE%==true cmake --build . --config "%CONFIGURATION%" -- %CMAKE_BUILDFLAGS% ) - cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%CONFIGURATION% ..\JKQtPlotterBuildAllExamples.pro
#- cmd: if %USE_CMAKE%==false echo --- Run QMake Configure ----------------------------------------------------------------------------- && - cmd: if %USE_CMAKE%==false call %MAKETOOL%
- cmd: if %USE_CMAKE%==false qmake.exe -v &&
- 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 call %MAKETOOL% &&
- cmd: cd .. - cmd: cd ..
@ -211,21 +143,32 @@ for:
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: export QTDIR=$HOME/Qt/$QTVER/$QTABI/
- sh: export Qt5_DIR=$QTDIR/lib/cmake
- sh: sudo apt update -qq - sh: sudo apt update -qq
- sh: sudo apt install -y build-essential git qt5-qmake cmake - sh: sudo apt install -y build-essential git graphviz doxygen mesa-common-dev libglu1-mesa-dev qt5-qmake cmake
- sh: echo QTDIR=$QTDIR - sh: echo QTDIR=$QTDIR
- sh: echo Qt5_DIR=$Qt5_DIR
- sh: ls /home/appveyor
- sh: ls /home/appveyor/Qt
- sh: ls /home/appveyor/Qt/5.15
- sh: ls /home/appveyor/Qt/5.15/gcc_64
- sh: echo PATH=$PATH - sh: echo PATH=$PATH
- sh: echo == INSTALL OPENCV =============================================================================== - sh: sudo apt-get update -y
# Install OpenCV # Install OpenCV
- sh: echo == INSTALL OPENCV ===============================================================================
- sh: sudo apt install -y libopencv-dev - sh: sudo apt install -y libopencv-dev
# Install CImg
- sh: echo == INSTALL CImg =================================================================================
- sh: sudo apt install -y cimg-dev
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: doxygen --version
- sh: cmake --version - sh: cmake --version
- sh: cmake -G "$CMAKE_GENERATOR" .. - sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" ..
- sh: echo --- Build using CMake ------------------------------------------------------------------------------- - sh: echo --- Build using CMake -------------------------------------------------------------------------------
- sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS ) - sh: cmake --build . --config "$CONFIGURATION" -- $CMAKE_BUILDFLAGS