Upgrade to CMake 3.21 (#581)

Author: walbourn

.github/workflows/bvt.yml

@@ -44,14 +44,14 @@ jobs:
 
       matrix:
         toolver: ['14.29', '14']
-        build_type: [x64-Release]
+        build_type: [x64-Release, x64-Release-Win10]
         arch: [amd64]
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Clone test repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           repository: walbourn/directxtktest
           path: Tests

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-cmake_minimum_required (VERSION 3.20)
+cmake_minimum_required (VERSION 3.21)
 
 set(DIRECTXTK_VERSION 1.9.2)
 

CMakePresets.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
   "configurePresets": [
     {
       "name": "base",
@@ -8,7 +8,7 @@
       "generator": "Ninja",
       "hidden": true,
       "binaryDir": "${sourceDir}/out/build/${presetName}",
-      "cacheVariables": { "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}" }
+      "installDir": "${sourceDir}/out/install/${presetName}"
     },
 
     {
@@ -164,12 +164,7 @@
     },
     {
       "name": "VCPKG",
-      "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": {
-          "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
-          "type": "FILEPATH"
-        }
-      },
+      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
       "hidden": true
     },
     {
@@ -347,6 +342,11 @@
     { "name": "x86-Debug"      , "configurePreset": "x86-Debug" },
     { "name": "x86-Release"    , "configurePreset": "x86-Release" },
 
+    { "name": "x64-Debug-Win10"  , "configurePreset": "x64-Debug-Win10" },
+    { "name": "x64-Release-Win10", "configurePreset": "x64-Release-Win10" },
+    { "name": "x86-Debug-Win10"  , "configurePreset": "x86-Debug-Win10" },
+    { "name": "x86-Release-Win10", "configurePreset": "x86-Release-Win10" },
+
     { "name": "arm64-Debug"    , "configurePreset": "arm64-Debug" },
     { "name": "arm64-Release"  , "configurePreset": "arm64-Release" },
     { "name": "arm64ec-Debug"  , "configurePreset": "arm64ec-Debug" },

README.md

@@ -78,6 +78,8 @@ FOR SECURITY ADVISORIES, see [GitHub](https://github.com/microsoft/DirectXTK/sec
 
 For a full change history, see [CHANGELOG.md](https://github.com/microsoft/DirectXTK/blob/main/CHANGELOG.md).
 
+* The CMake projects require 3.21 or later. VS 2019 users will need to install a standalone version of CMake 3.21 or later and add it to their PATH.
+
 * Starting with the March 2025 release, Windows 7 and Windows 8.0 support has been retired. For _DirectX ToolKit for Audio_ this means that `DirectXTKAudio_Desktop_*_Win7` has been removed, and `DirectXTKAudio_Desktop_*_Win8` has been integrated into the `DirectXTK_Desktop_*` vcxproj which uses XAudio 2.8 for Windows 8.1 compatibility.
 
   * Remove any References to or use of `DirectXTKAudio_Desktop_*_Win8.vcxproj` or `DirectXTKAudio_Desktop_*_Win7`. If using `DirectXTK_Desktop_*.vcxproj` you will be using XAudio 2.8 as before. Client code will need to build with `_WIN32_WINNT=0x0603`.

Src/LoaderHelpers.h

@@ -16,6 +16,12 @@
 #include "DDSTextureLoader.h"
 #include "PlatformHelpers.h"
 
+#include <algorithm>
+#include <cfloat>
+#include <cmath>
+#include <memory>
+#include <new>
+#include <tuple>
 
 namespace DirectX
 {

Src/PlatformHelpers.h

@@ -14,6 +14,7 @@
 #pragma warning(disable : 4324)
 #endif
 
+#include <cstdio>
 #include <exception>
 #include <memory>