From f8ac685b9ad0e4e0ed134932ef9f5305c93bed65 Mon Sep 17 00:00:00 2001 From: Jochen Ulrich Date: Wed, 23 Mar 2022 00:53:02 +0100 Subject: [PATCH 1/3] ci: Add testing against Qt 6 --- .appveyor.yml | 60 +++++++++++++++++++++++++++++++------------- tests/CMakeLists.txt | 19 ++++++++++---- 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 1bc531d..60d38ce 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,24 +1,48 @@ version: "1.5.0+{build}" environment: - CTEST_OUTPUT_ON_FAILURE: '1' matrix: - - CMAKE_GENERATOR: Visual Studio 15 2017 Win64 - QT_DIR: C:\Qt\5.12\msvc2017_64 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"' - - CMAKE_GENERATOR: Visual Studio 14 2015 - QT_DIR: C:\Qt\5.9\msvc2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' - - CMAKE_GENERATOR: Visual Studio 14 2015 - QT_DIR: C:\Qt\5.6\msvc2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' - - CMAKE_GENERATOR: Visual Studio 12 2013 - QT_DIR: C:\Qt\5.6\msvc2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86' + - job_name: VS 2019 x64, Qt 6.2 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CMAKE_GENERATOR: Visual Studio 16 2019 + QT_DIR: C:\Qt\6.2\msvc2019_64 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' + CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' + + - job_name: VS 2019 x64, Qt 5.15 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CMAKE_GENERATOR: Visual Studio 16 2019 + QT_DIR: C:\Qt\5.15\msvc2019_64 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' + CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' + + - job_name: VS 2017 x64, Qt 5.12 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CMAKE_GENERATOR: Visual Studio 15 2017 Win64 + QT_DIR: C:\Qt\5.12\msvc2017_64 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"' + CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' + + - job_name: VS 2015 x86, Qt 5.9 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + CMAKE_GENERATOR: Visual Studio 14 2015 + QT_DIR: C:\Qt\5.9\msvc2015 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' + CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' + + - job_name: VS 2015 x86, Qt 5.6 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + CMAKE_GENERATOR: Visual Studio 14 2015 + QT_DIR: C:\Qt\5.6\msvc2015 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' + CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' + + - job_name: VS 2013 x86, Qt 5.6 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + CMAKE_GENERATOR: Visual Studio 12 2013 + QT_DIR: C:\Qt\5.6\msvc2013 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86' + CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' cache: - C:\.hunter -> .appveyor.yml, **\CMakeLists.txt, **\*.cmake @@ -37,4 +61,4 @@ build: test_script: - - msbuild "%APPVEYOR_BUILD_FOLDER%\tests\_build\RUN_TESTS.vcxproj" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" \ No newline at end of file + - '"%CMAKE_INSTALL_PATH%\bin\ctest.exe" --output-on-failure -C Debug' diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4148ab7..12a07ee 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -64,11 +64,20 @@ if(CXX_SUPPORTS_STRONG_ENUMS) endif() set(CMAKE_AUTOMOC ON) -find_package(Qt5 COMPONENTS Core OPTIONAL_COMPONENTS Network) -if (Qt5_FOUND) - set(QTCORE_LIB Qt5::Core) - if (Qt5Network_FOUND) - set(QTNETWORK_LIB Qt5::Network) +find_package(Qt6 COMPONENTS Core OPTIONAL_COMPONENTS Network) +if (Qt6_FOUND) + set(QTCORE_LIB Qt6::Core) + if (Qt6Network_FOUND) + set(QTNETWORK_LIB Qt6::Network) + endif() +endif() +if (NOT QTCORE_LIB) + find_package(Qt5 COMPONENTS Core OPTIONAL_COMPONENTS Network) + if (Qt5_FOUND) + set(QTCORE_LIB Qt5::Core) + if (Qt5Network_FOUND) + set(QTNETWORK_LIB Qt5::Network) + endif() endif() endif() if (NOT QTCORE_LIB) From ab9200a907a841dd7fcfd5f6dea8e05b0ac94dea Mon Sep 17 00:00:00 2001 From: Jochen Ulrich Date: Wed, 23 Mar 2022 00:56:58 +0100 Subject: [PATCH 2/3] ci: Fix YAML syntax --- .appveyor.yml | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 60d38ce..db87851 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,46 +3,46 @@ version: "1.5.0+{build}" environment: matrix: - job_name: VS 2019 x64, Qt 6.2 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMAKE_GENERATOR: Visual Studio 16 2019 - QT_DIR: C:\Qt\6.2\msvc2019_64 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' - CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CMAKE_GENERATOR: Visual Studio 16 2019 + QT_DIR: C:\Qt\6.2\msvc2019_64 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' + CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' - job_name: VS 2019 x64, Qt 5.15 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - CMAKE_GENERATOR: Visual Studio 16 2019 - QT_DIR: C:\Qt\5.15\msvc2019_64 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' - CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CMAKE_GENERATOR: Visual Studio 16 2019 + QT_DIR: C:\Qt\5.15\msvc2019_64 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64' + CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' - job_name: VS 2017 x64, Qt 5.12 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - CMAKE_GENERATOR: Visual Studio 15 2017 Win64 - QT_DIR: C:\Qt\5.12\msvc2017_64 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"' - CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + CMAKE_GENERATOR: Visual Studio 15 2017 Win64 + QT_DIR: C:\Qt\5.12\msvc2017_64 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"' + CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' - job_name: VS 2015 x86, Qt 5.9 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - CMAKE_GENERATOR: Visual Studio 14 2015 - QT_DIR: C:\Qt\5.9\msvc2015 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' - CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + CMAKE_GENERATOR: Visual Studio 14 2015 + QT_DIR: C:\Qt\5.9\msvc2015 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' + CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' - job_name: VS 2015 x86, Qt 5.6 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - CMAKE_GENERATOR: Visual Studio 14 2015 - QT_DIR: C:\Qt\5.6\msvc2015 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' - CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + CMAKE_GENERATOR: Visual Studio 14 2015 + QT_DIR: C:\Qt\5.6\msvc2015 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86' + CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' - job_name: VS 2013 x86, Qt 5.6 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - CMAKE_GENERATOR: Visual Studio 12 2013 - QT_DIR: C:\Qt\5.6\msvc2013 - VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86' - CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + CMAKE_GENERATOR: Visual Studio 12 2013 + QT_DIR: C:\Qt\5.6\msvc2013 + VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86' + CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' cache: - C:\.hunter -> .appveyor.yml, **\CMakeLists.txt, **\*.cmake From 833e287cde4af9251a07b8091a5cdba95cd18664 Mon Sep 17 00:00:00 2001 From: Jochen Ulrich Date: Wed, 23 Mar 2022 01:33:30 +0100 Subject: [PATCH 3/3] ci: Fix CMake path for VS 2017 image --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index db87851..734e93d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,7 +21,7 @@ environment: CMAKE_GENERATOR: Visual Studio 15 2017 Win64 QT_DIR: C:\Qt\5.12\msvc2017_64 VCVARS_COMMANDLINE: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"' - CMAKE_INSTALL_PATH: 'C:\Program Files\CMake' + CMAKE_INSTALL_PATH: 'C:\Program Files (x86)\CMake' - job_name: VS 2015 x86, Qt 5.9 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015