mirror of
https://github.com/jkriege2/JKQtPlotter.git
synced 2024-11-15 10:05:47 +08:00
Update appveyor.yml: Add C++20 build
This commit is contained in:
parent
0f956ae8a5
commit
1dc569d534
73
appveyor.yml
73
appveyor.yml
@ -29,9 +29,44 @@ environment:
|
|||||||
USE_CMAKE: true
|
USE_CMAKE: true
|
||||||
INSTALL_QMAKE5: false
|
INSTALL_QMAKE5: false
|
||||||
BUILD_CONFIG: Debug
|
BUILD_CONFIG: Debug
|
||||||
|
USE_CXX20: OFF
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
|
- NAME: "Ubuntu2004: CMake, Qt6"
|
||||||
|
QTABI: gcc_64
|
||||||
|
COMPILER: GCC
|
||||||
|
QTVER: 6.7
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
||||||
|
CMAKE_GENERATOR: "Unix Makefiles"
|
||||||
|
INSTALL_QMAKE5: true
|
||||||
|
TEST_FETCHCONTENT: false
|
||||||
|
|
||||||
|
- NAME: "Ubuntu2004: CMake, Qt6, C++20"
|
||||||
|
QTABI: gcc_64
|
||||||
|
COMPILER: GCC
|
||||||
|
QTVER: 6.7
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
||||||
|
CMAKE_GENERATOR: "Unix Makefiles"
|
||||||
|
INSTALL_QMAKE5: true
|
||||||
|
TEST_FETCHCONTENT: false
|
||||||
|
USE_CXX20: ON
|
||||||
|
|
||||||
|
- NAME: "Ubuntu2004: CMake-FetchContent, Qt6"
|
||||||
|
QTABI: gcc_64
|
||||||
|
COMPILER: GCC
|
||||||
|
QTVER: 6.7
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
||||||
|
CMAKE_GENERATOR: "Unix Makefiles"
|
||||||
|
TEST_FETCHCONTENT: true
|
||||||
|
|
||||||
|
- NAME: "Ubuntu2004: CMake, Qt5"
|
||||||
|
QTABI: gcc_64
|
||||||
|
COMPILER: GCC
|
||||||
|
QTVER: 5.15
|
||||||
|
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
||||||
|
CMAKE_GENERATOR: "Unix Makefiles"
|
||||||
|
INSTALL_QMAKE5: true
|
||||||
|
TEST_FETCHCONTENT: false
|
||||||
|
|
||||||
- NAME: "Ubuntu2004: QMake, Qt6"
|
- NAME: "Ubuntu2004: QMake, Qt6"
|
||||||
QTABI: gcc_64
|
QTABI: gcc_64
|
||||||
@ -42,7 +77,7 @@ environment:
|
|||||||
CMAKE_GENERATOR: "Unix Makefiles"
|
CMAKE_GENERATOR: "Unix Makefiles"
|
||||||
INSTALL_QMAKE5: true
|
INSTALL_QMAKE5: true
|
||||||
TEST_FETCHCONTENT: false
|
TEST_FETCHCONTENT: false
|
||||||
|
|
||||||
- NAME: "MSVC64: CMake, Qt5"
|
- NAME: "MSVC64: CMake, Qt5"
|
||||||
QTABI: msvc2019_64
|
QTABI: msvc2019_64
|
||||||
COMPILER: MSVC
|
COMPILER: MSVC
|
||||||
@ -61,32 +96,6 @@ environment:
|
|||||||
CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount
|
CMAKE_BUILDFLAGS: /verbosity:minimal /maxcpucount
|
||||||
TEST_FETCHCONTENT: false
|
TEST_FETCHCONTENT: false
|
||||||
|
|
||||||
- NAME: "Ubuntu2004: CMake, Qt5"
|
|
||||||
QTABI: gcc_64
|
|
||||||
COMPILER: GCC
|
|
||||||
QTVER: 5.15
|
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
|
||||||
CMAKE_GENERATOR: "Unix Makefiles"
|
|
||||||
INSTALL_QMAKE5: true
|
|
||||||
TEST_FETCHCONTENT: false
|
|
||||||
|
|
||||||
- NAME: "Ubuntu2004: CMake, Qt6"
|
|
||||||
QTABI: gcc_64
|
|
||||||
COMPILER: GCC
|
|
||||||
QTVER: 6.7
|
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
|
||||||
CMAKE_GENERATOR: "Unix Makefiles"
|
|
||||||
INSTALL_QMAKE5: true
|
|
||||||
TEST_FETCHCONTENT: false
|
|
||||||
|
|
||||||
- NAME: "Ubuntu2004: CMake-FetchContent, Qt6"
|
|
||||||
QTABI: gcc_64
|
|
||||||
COMPILER: GCC
|
|
||||||
QTVER: 6.7
|
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
|
||||||
CMAKE_GENERATOR: "Unix Makefiles"
|
|
||||||
TEST_FETCHCONTENT: true
|
|
||||||
|
|
||||||
- NAME: "MacOS: CMake, Qt6"
|
- NAME: "MacOS: CMake, Qt6"
|
||||||
QTABI: macos
|
QTABI: macos
|
||||||
COMPILER: CLANG
|
COMPILER: CLANG
|
||||||
@ -94,7 +103,7 @@ environment:
|
|||||||
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
|
||||||
CMAKE_GENERATOR: "Unix Makefiles"
|
CMAKE_GENERATOR: "Unix Makefiles"
|
||||||
TEST_FETCHCONTENT: false
|
TEST_FETCHCONTENT: false
|
||||||
|
|
||||||
|
|
||||||
for:
|
for:
|
||||||
# Windows (MinGW 8.1 & MSVC2019)
|
# Windows (MinGW 8.1 & MSVC2019)
|
||||||
@ -148,7 +157,7 @@ for:
|
|||||||
- cmd: mkdir install
|
- cmd: mkdir install
|
||||||
- cmd: cd build
|
- cmd: cd build
|
||||||
- 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%;%CIMG_INCLUDE_DIR%" "-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\install" ..
|
- cmd: if %USE_CMAKE%==true cmake -G "%CMAKE_GENERATOR%" "-DCMAKE_PREFIX_PATH=%QTDIR%;%CIMG_INCLUDE_DIR%" "-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\install" "-DJKQtPlotter_ENABLED_CXX20=$USE_CXX20" ..
|
||||||
- cmd: if %USE_CMAKE%==true cmake --build . --config "%BUILD_CONFIG%" -j%NUMBER_OF_PROCESSORS% -- %CMAKE_BUILDFLAGS%
|
- cmd: if %USE_CMAKE%==true cmake --build . --config "%BUILD_CONFIG%" -j%NUMBER_OF_PROCESSORS% -- %CMAKE_BUILDFLAGS%
|
||||||
- cmd: if %USE_CMAKE%==false qmake.exe -v
|
- cmd: if %USE_CMAKE%==false qmake.exe -v
|
||||||
- cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%BUILD_CONFIG% ..\JKQtPlotterBuildAllExamples.pro
|
- cmd: if %USE_CMAKE%==false qmake.exe CONFIG+=%BUILD_CONFIG% ..\JKQtPlotterBuildAllExamples.pro
|
||||||
@ -249,7 +258,7 @@ for:
|
|||||||
cd build
|
cd build
|
||||||
echo --- Run CMake Configure -----------------------------------------------------------------------------
|
echo --- Run CMake Configure -----------------------------------------------------------------------------
|
||||||
cmake --version
|
cmake --version
|
||||||
cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR;$CIMG_INCLUDE_DIR" "-DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/install" "-DCMAKE_BUILD_TYPE=$BUILD_CONFIG" ..
|
cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR;$CIMG_INCLUDE_DIR" "-DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/install" "-DCMAKE_BUILD_TYPE=$BUILD_CONFIG" "-DJKQtPlotter_ENABLED_CXX20=$USE_CXX20" ..
|
||||||
echo --- Build using CMake -------------------------------------------------------------------------------
|
echo --- Build using CMake -------------------------------------------------------------------------------
|
||||||
cmake --build . --config "$BUILD_CONFIG" -j$(getconf _NPROCESSORS_ONLN) -- $CMAKE_BUILDFLAGS
|
cmake --build . --config "$BUILD_CONFIG" -j$(getconf _NPROCESSORS_ONLN) -- $CMAKE_BUILDFLAGS
|
||||||
|
|
||||||
@ -260,7 +269,7 @@ for:
|
|||||||
cd build
|
cd build
|
||||||
echo --- Run CMake Configure with FetchCOntent -----------------------------------------------------------
|
echo --- Run CMake Configure with FetchCOntent -----------------------------------------------------------
|
||||||
cmake --version
|
cmake --version
|
||||||
cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR;$CIMG_INCLUDE_DIR" "-DCMAKE_BUILD_TYPE=$BUILD_CONFIG" "-DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/install" ..
|
cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR;$CIMG_INCLUDE_DIR" "-DCMAKE_BUILD_TYPE=$BUILD_CONFIG" "-DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/install" "-DJKQtPlotter_ENABLED_CXX20=$USE_CXX20" ..
|
||||||
echo --- Build using CMake with FetchCOntent -------------------------------------------------------------
|
echo --- Build using CMake with FetchCOntent -------------------------------------------------------------
|
||||||
cmake --build . --config "$BUILD_CONFIG" -j$(getconf _NPROCESSORS_ONLN) -- $CMAKE_BUILDFLAGS
|
cmake --build . --config "$BUILD_CONFIG" -j$(getconf _NPROCESSORS_ONLN) -- $CMAKE_BUILDFLAGS
|
||||||
fi
|
fi
|
||||||
@ -342,7 +351,7 @@ for:
|
|||||||
- 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" "-DCMAKE_BUILD_TYPE=$BUILD_CONFIG" "-DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/install" .. ..
|
- sh: cmake -G "$CMAKE_GENERATOR" "-DCMAKE_PREFIX_PATH=$QTDIR" "-DCMAKE_BUILD_TYPE=$BUILD_CONFIG" "-DJKQtPlotter_ENABLED_CXX20=$USE_CXX20" "-DCMAKE_INSTALL_PREFIX=$APPVEYOR_BUILD_FOLDER/install" .. ..
|
||||||
- sh: echo --- Build using CMake -------------------------------------------------------------------------------
|
- sh: echo --- Build using CMake -------------------------------------------------------------------------------
|
||||||
- sh: cmake --build . --config "$BUILD_CONFIG" -j$(getconf _NPROCESSORS_ONLN) -- $CMAKE_BUILDFLAGS
|
- sh: cmake --build . --config "$BUILD_CONFIG" -j$(getconf _NPROCESSORS_ONLN) -- $CMAKE_BUILDFLAGS
|
||||||
- sh: |
|
- sh: |
|
||||||
|
Loading…
Reference in New Issue
Block a user