CMakePM: Add include presets support

Fixes: QTCREATORBUG-28894
Change-Id: I9359cb85c230f2db02f08427af9832f168a32c41
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

3 files changed, 142 insertions, 117 deletions

diff --git a/tests/manual/cmakepresets/CMakePresets.json b/tests/manual/cmakepresets/CMakePresets.json
index da98c991ba..933e55ff69 100644
--- a/tests/manual/cmakepresets/CMakePresets.json
+++ b/tests/manual/cmakepresets/CMakePresets.json
@@ -1,93 +1,15 @@
 {
-  "version": 3,
+  "version": 4,
   "cmakeMinimumRequired": {
     "major": 3,
-    "minor": 21,
+    "minor": 23,
     "patch": 0
   },
+  "include": [
+    "mingw.json", "msvc.json"
+  ],
   "configurePresets": [
     {
-      "name": "mingw",
-      "displayName": "MinGW 11.2.0",
-      "generator": "Ninja",
-      "installDir": "../inst-${presetName}",
-      "cacheVariables": {
-        "CMAKE_PREFIX_PATH": "$env{SYSTEMDRIVE}/Qt/6.4.2/mingw_64"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      },
-      "environment": {
-        "PATH": "$env{SYSTEMDRIVE}/Qt/Tools/mingw1120_64/bin;$penv{PATH}"
-      },
-      "debug" : {
-        "find" : true
-      }
-    },
-    {
-      "name": "mingw-make",
-      "binaryDir": "${sourceDir}/build-${presetName}-release",
-      "displayName": "MinGW 11.2.0 Makefiles",
-      "generator": "MinGW Makefiles",
-      "inherits" : "mingw",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_PREFIX_PATH": "$env{SystemDrive}/Qt/6.4.2/mingw_64"
-      }
-    },
-    {
-      "name": "visualc",
-      "displayName": "Visual C++ 2019 x64",
-      "generator": "Visual Studio 16 2019",
-      "binaryDir": "${sourceDir}/build-${presetName}",
-      "architecture" : {
-        "value": "x64"
-      },
-      "toolchainFile" : "../cmakepresets/msvc-toolchain.cmake",
-      "condition" : {
-        "type": "not",
-        "condition": {
-          "type": "notEquals",
-          "lhs": "${hostSystemName}",
-          "rhs": "$env{HOST_SYSTEM_NAME}"
-        }
-      },
-      "environment" : {
-        "HOST_SYSTEM_NAME": "Windows",
-        "QT_VERSION": "6.4.2"
-      }
-    },
-    {
-      "name": "visualc-ninja",
-      "displayName": "Visual C++ 2019 x64 Ninja",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build-${presetName}",
-      "toolchainFile" : "c:/Qt/6.4.2/msvc2019_64/lib/cmake/Qt6/qt.toolchain.cmake",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Windows"
-      },
-      "environment" : {
-        "VCToolsVersion": "14.29.30133",
-        "WindowsSDKVersion" : "10.0.22000.0",
-        "VCArch": "x64",
-        "VCToolsInstallDir": "$env{ProgramFiles(x86)}/Microsoft Visual Studio/2019/Professional/VC/Tools/MSVC/$env{VCToolsVersion}",
-        "WindowsSdkDir" : "$env{ProgramFiles(x86)}/Windows Kits/10",
-        "WindowsSdkIncVerDir": "$env{WindowsSdkDir}/Include/$env{WindowsSDKVersion}",
-        "WindowsSdkLibVerDir": "$env{WindowsSdkDir}/Lib/$env{WindowsSDKVersion}",
-
-        "INCLUDE": "$env{VCToolsInstallDir}/ATLMFC/include;$env{VCToolsInstallDir}/include;$env{WindowsSdkIncVerDir}/ucrt;$env{WindowsSdkIncVerDir}/shared;$env{WindowsSdkIncVerDir}/um;$env{WindowsSdkIncVerDir}/winrt;$env{WindowsSdkIncVerDir}/cppwinrt",
-        "LIB": "$env{VCToolsInstallDir}/ATLMFC/lib/$env{VCArch};$env{VCToolsInstallDir}/lib/$env{VCArch};$env{WindowsSdkLibVerDir}/ucrt/$env{VCArch};$env{WindowsSdkLibVerDir}/um/$env{VCArch}",
-        "PATH": "$env{VCToolsInstallDir}/bin/HostX64/$env{VCArch};$env{WindowsSdkDir}/bin/$env{WindowsSDKVersion}/$env{VCArch};$penv{PATH}"
-      }
-    },
-    {
       "name": "linux-gcc",
       "displayName": "Linux GCC",
       "generator": "Ninja",
@@ -99,39 +21,5 @@
         "rhs": "Linux"
       }
     }
-  ],
-  "buildPresets": [
-    {
-      "name": "mingw",
-      "displayName": "MinGW default",
-      "configurePreset": "mingw",
-      "targets": "${sourceDirName}"
-    },
-    {
-      "name": "mingw-verbose",
-      "inherits": "mingw",
-      "displayName": "MinGW verbose",
-      "verbose": true
-    },
-    {
-      "name": "mingw-make",
-      "displayName": "MinGW make 4 CPUs",
-      "configurePreset": "mingw-make",
-      "jobs": 4
-    },
-    {
-      "name": "visualc-debug",
-      "configurePreset": "visualc",
-      "configuration": "Debug"
-    },
-    {
-      "name": "visualc-relwithdebinfo",
-      "inherits": "visualc-debug",
-      "configuration": "RelWithDebInfo"
-    },
-    {
-      "name": "visualc-ninja",
-      "configurePreset": "visualc-ninja"
-    }
   ]
 }
diff --git a/tests/manual/cmakepresets/mingw.json b/tests/manual/cmakepresets/mingw.json
new file mode 100644
index 0000000000..01a240f716
--- /dev/null
+++ b/tests/manual/cmakepresets/mingw.json
@@ -0,0 +1,61 @@
+{
+  "version": 4,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 23,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "mingw",
+      "displayName": "MinGW 11.2.0",
+      "generator": "Ninja",
+      "installDir": "../inst-${presetName}",
+      "cacheVariables": {
+        "CMAKE_PREFIX_PATH": "$env{SYSTEMDRIVE}/Qt/6.4.2/mingw_64"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "environment": {
+        "PATH": "$env{SYSTEMDRIVE}/Qt/Tools/mingw1120_64/bin;$penv{PATH}"
+      },
+      "debug" : {
+        "find" : true
+      }
+    },
+    {
+      "name": "mingw-make",
+      "binaryDir": "${sourceDir}/build-${presetName}-release",
+      "displayName": "MinGW 11.2.0 Makefiles",
+      "generator": "MinGW Makefiles",
+      "inherits" : "mingw",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_PREFIX_PATH": "$env{SystemDrive}/Qt/6.4.2/mingw_64"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "mingw",
+      "displayName": "MinGW default",
+      "configurePreset": "mingw",
+      "targets": "${sourceDirName}"
+    },
+    {
+      "name": "mingw-verbose",
+      "inherits": "mingw",
+      "displayName": "MinGW verbose",
+      "verbose": true
+    },
+    {
+      "name": "mingw-make",
+      "displayName": "MinGW make 4 CPUs",
+      "configurePreset": "mingw-make",
+      "jobs": 4
+    }
+  ]
+}
diff --git a/tests/manual/cmakepresets/msvc.json b/tests/manual/cmakepresets/msvc.json
new file mode 100644
index 0000000000..5f4c9b4c5d
--- /dev/null
+++ b/tests/manual/cmakepresets/msvc.json
@@ -0,0 +1,76 @@
+{
+  "version": 4,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 23,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "visualc",
+      "displayName": "Visual C++ 2019 x64",
+      "generator": "Visual Studio 16 2019",
+      "binaryDir": "${sourceDir}/build-${presetName}",
+      "architecture" : {
+        "value": "x64"
+      },
+      "toolchainFile" : "../cmakepresets/msvc-toolchain.cmake",
+      "condition" : {
+        "type": "not",
+        "condition": {
+          "type": "notEquals",
+          "lhs": "${hostSystemName}",
+          "rhs": "$env{HOST_SYSTEM_NAME}"
+        }
+      },
+      "environment" : {
+        "HOST_SYSTEM_NAME": "Windows",
+        "QT_VERSION": "6.4.2"
+      }
+    },
+    {
+      "name": "visualc-ninja",
+      "displayName": "Visual C++ 2019 x64 Ninja",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build-${presetName}",
+      "toolchainFile" : "c:/Qt/6.4.2/msvc2019_64/lib/cmake/Qt6/qt.toolchain.cmake",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "environment" : {
+        "VCToolsVersion": "14.29.30133",
+        "WindowsSDKVersion" : "10.0.22000.0",
+        "VCArch": "x64",
+        "VCToolsInstallDir": "$env{ProgramFiles(x86)}/Microsoft Visual Studio/2019/Professional/VC/Tools/MSVC/$env{VCToolsVersion}",
+        "WindowsSdkDir" : "$env{ProgramFiles(x86)}/Windows Kits/10",
+        "WindowsSdkIncVerDir": "$env{WindowsSdkDir}/Include/$env{WindowsSDKVersion}",
+        "WindowsSdkLibVerDir": "$env{WindowsSdkDir}/Lib/$env{WindowsSDKVersion}",
+
+        "INCLUDE": "$env{VCToolsInstallDir}/ATLMFC/include;$env{VCToolsInstallDir}/include;$env{WindowsSdkIncVerDir}/ucrt;$env{WindowsSdkIncVerDir}/shared;$env{WindowsSdkIncVerDir}/um;$env{WindowsSdkIncVerDir}/winrt;$env{WindowsSdkIncVerDir}/cppwinrt",
+        "LIB": "$env{VCToolsInstallDir}/ATLMFC/lib/$env{VCArch};$env{VCToolsInstallDir}/lib/$env{VCArch};$env{WindowsSdkLibVerDir}/ucrt/$env{VCArch};$env{WindowsSdkLibVerDir}/um/$env{VCArch}",
+        "PATH": "$env{VCToolsInstallDir}/bin/HostX64/$env{VCArch};$env{WindowsSdkDir}/bin/$env{WindowsSDKVersion}/$env{VCArch};$penv{PATH}"
+      }
+    }
+  ],
+  "buildPresets": [
+   {
+      "name": "visualc-debug",
+      "configurePreset": "visualc",
+      "configuration": "Debug"
+    },
+    {
+      "name": "visualc-relwithdebinfo",
+      "inherits": "visualc-debug",
+      "configuration": "RelWithDebInfo"
+    },
+    {
+      "name": "visualc-ninja",
+      "configurePreset": "visualc-ninja"
+    }
+  ]
+}