From 778828c8ef832d386c26288dd8e4771ef1e756a4 Mon Sep 17 00:00:00 2001 From: Benno Waldhauer Date: Wed, 24 Jun 2026 22:47:38 +0200 Subject: [PATCH 1/5] bump minimal cmake version, list cmake capabilities --- .github/workflows/windows.yml | 5 +++++ CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6b26808..a3164a5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,6 +19,11 @@ jobs: with: python-version: '3.x' + - name: List CMake capabilities + shell: cmd + run: | + cmake --help + - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b527d5..f54f1b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.21) cmake_policy(SET CMP0091 NEW) message(STATUS "Read contents from vcpkg.json") From 19c71d6c7e238ceaabc7f4ac46a694b629b4247a Mon Sep 17 00:00:00 2001 From: Benno Waldhauer Date: Wed, 24 Jun 2026 23:08:32 +0200 Subject: [PATCH 2/5] try ninja generator --- build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.bat b/build.bat index 3fc464c..355fd49 100644 --- a/build.bat +++ b/build.bat @@ -66,7 +66,7 @@ if %errorlevel% equ 0 ( ) echo Project build examples: %build_examples% -cmake -B "%build_dir%" -S . -DWT_BUILD_TESTS=%build_tests% -DWT_SKIP_TESTS=%skip_tests% -DWT_BUILD_EXAMPLES=%build_examples% -DWT_WITH_SSL=%ssl_support% -DCMAKE_BUILD_TYPE=%build_type% -DCMAKE_TOOLCHAIN_FILE="%toolchain_file%" -DVCPKG_TARGET_TRIPLET="%vcpkg_triplet%" -G "Visual Studio 17 2022" -A "%build_arch%" +cmake -B "%build_dir%" -S . -DWT_BUILD_TESTS=%build_tests% -DWT_SKIP_TESTS=%skip_tests% -DWT_BUILD_EXAMPLES=%build_examples% -DWT_WITH_SSL=%ssl_support% -DCMAKE_BUILD_TYPE=%build_type% -DCMAKE_TOOLCHAIN_FILE="%toolchain_file%" -DVCPKG_TARGET_TRIPLET="%vcpkg_triplet%" -G "Ninja" -A "%build_arch%" cmake --build "%build_dir%" --config "%build_type%" --parallel %NUMBER_OF_PROCESSORS% ctest --test-dir "%build_dir%\test\" \ No newline at end of file From d757d3be69d6f8cd2d7ca233f082d2a9b84962b3 Mon Sep 17 00:00:00 2001 From: Benno Waldhauer Date: Wed, 24 Jun 2026 23:25:56 +0200 Subject: [PATCH 3/5] use vs 2026 generator --- build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.bat b/build.bat index 355fd49..fd94fed 100644 --- a/build.bat +++ b/build.bat @@ -66,7 +66,7 @@ if %errorlevel% equ 0 ( ) echo Project build examples: %build_examples% -cmake -B "%build_dir%" -S . -DWT_BUILD_TESTS=%build_tests% -DWT_SKIP_TESTS=%skip_tests% -DWT_BUILD_EXAMPLES=%build_examples% -DWT_WITH_SSL=%ssl_support% -DCMAKE_BUILD_TYPE=%build_type% -DCMAKE_TOOLCHAIN_FILE="%toolchain_file%" -DVCPKG_TARGET_TRIPLET="%vcpkg_triplet%" -G "Ninja" -A "%build_arch%" +cmake -B "%build_dir%" -S . -DWT_BUILD_TESTS=%build_tests% -DWT_SKIP_TESTS=%skip_tests% -DWT_BUILD_EXAMPLES=%build_examples% -DWT_WITH_SSL=%ssl_support% -DCMAKE_BUILD_TYPE=%build_type% -DCMAKE_TOOLCHAIN_FILE="%toolchain_file%" -DVCPKG_TARGET_TRIPLET="%vcpkg_triplet%" -G "Visual Studio 18 2026" -A "%build_arch%" cmake --build "%build_dir%" --config "%build_type%" --parallel %NUMBER_OF_PROCESSORS% ctest --test-dir "%build_dir%\test\" \ No newline at end of file From a696b5bdcb76f7a21e37af8f5d533a8a39ceb78f Mon Sep 17 00:00:00 2001 From: Benno Waldhauer Date: Wed, 24 Jun 2026 23:40:13 +0200 Subject: [PATCH 4/5] remove trailing \ from ctest command --- build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.bat b/build.bat index fd94fed..6533be8 100644 --- a/build.bat +++ b/build.bat @@ -69,4 +69,4 @@ echo Project build examples: %build_examples% cmake -B "%build_dir%" -S . -DWT_BUILD_TESTS=%build_tests% -DWT_SKIP_TESTS=%skip_tests% -DWT_BUILD_EXAMPLES=%build_examples% -DWT_WITH_SSL=%ssl_support% -DCMAKE_BUILD_TYPE=%build_type% -DCMAKE_TOOLCHAIN_FILE="%toolchain_file%" -DVCPKG_TARGET_TRIPLET="%vcpkg_triplet%" -G "Visual Studio 18 2026" -A "%build_arch%" cmake --build "%build_dir%" --config "%build_type%" --parallel %NUMBER_OF_PROCESSORS% -ctest --test-dir "%build_dir%\test\" \ No newline at end of file +ctest --test-dir "%build_dir%\test" \ No newline at end of file From 1a19fcbfeb96367500161d2b4cc94cc7448357d2 Mon Sep 17 00:00:00 2001 From: Benno Waldhauer Date: Thu, 25 Jun 2026 00:01:46 +0200 Subject: [PATCH 5/5] Remove CMake capabilities listing step Removed step to list CMake capabilities from workflow. --- .github/workflows/windows.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a3164a5..6b26808 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,11 +19,6 @@ jobs: with: python-version: '3.x' - - name: List CMake capabilities - shell: cmd - run: | - cmake --help - - name: Setup MSBuild uses: microsoft/setup-msbuild@v2