diff --git a/deps/cmake/bin/cmake b/deps/cmake/bin/cmake
index 5b12ed80..d2095810 100755
Binary files a/deps/cmake/bin/cmake and b/deps/cmake/bin/cmake differ
diff --git a/deps/cmake/share/aclocal/cmake.m4 b/deps/cmake/share/aclocal/cmake.m4
index a40c0ae9..39826bcd 100644
--- a/deps/cmake/share/aclocal/cmake.m4
+++ b/deps/cmake/share/aclocal/cmake.m4
@@ -13,7 +13,7 @@ fi
 # $2: language (e.g. C/CXX/Fortran)
 # $3: The compiler ID, defaults to GNU.
 #     Possible values are: GNU, Intel, Clang, SunPro, HP, XL, VisualAge, PGI,
-#     PathScale, Cray, SCO, MSVC
+#     PathScale, Cray, SCO, MSVC, LCC
 # $4: optional extra arguments to cmake, e.g. "-DCMAKE_SIZEOF_VOID_P=8"
 # $5: optional path to cmake binary
 AC_DEFUN([CMAKE_FIND_PACKAGE], [
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompilerABI.cu b/deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompilerABI.cu
deleted file mode 100644
index 449a0794..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompilerABI.cu
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __CUDACC__
-#  error "A C or C++ compiler has been selected for CUDA"
-#endif
-
-#include "CMakeCompilerABI.h"
-
-int main(int argc, char* argv[])
-{
-  int require = 0;
-  require += info_sizeof_dptr[argc];
-  require += info_byte_order_big_endian[argc];
-  require += info_byte_order_little_endian[argc];
-#if defined(ABI_ID)
-  require += info_abi[argc];
-#endif
-  (void)argv;
-  return require;
-}
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDependentOption.cmake b/deps/cmake/share/cmake-3.21/Modules/CMakeDependentOption.cmake
deleted file mode 100644
index 96855d28..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDependentOption.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-CMakeDependentOption
---------------------
-
-Macro to provide an option dependent on other options.
-
-This macro presents an option to the user only if a set of other
-conditions are true.
-
-Usage:
-
-.. code-block:: cmake
-
-  cmake_dependent_option(<option> "<help_text>" <value> <depends> <force>)
-
-Where ``<option>`` is available to the user if ``<depends>`` is true. When
-``<option>`` is available, the given ``<help_text>`` and initial ``<value>``
-are used. If the ``<depends>`` condition is not true, ``<option>`` will not be
-presented and will always have the value given by ``<force>``. Any value set by
-the user is preserved for when the option is presented again. Each element in
-the fourth parameter is evaluated as an if-condition, so
-:ref:`Condition Syntax` can be used.
-
-Example invocation:
-
-.. code-block:: cmake
-
-  cmake_dependent_option(USE_FOO "Use Foo" ON
-                         "USE_BAR;NOT USE_ZOT" OFF)
-
-If ``USE_BAR`` is true and ``USE_ZOT`` is false, this provides an option called
-``USE_FOO`` that defaults to ON. Otherwise, it sets ``USE_FOO`` to OFF and
-hides the option from the user. If the status of ``USE_BAR`` or ``USE_ZOT``
-ever changes, any value for the ``USE_FOO`` option is saved so that when the
-option is re-enabled it retains its old value.
-#]=======================================================================]
-
-macro(CMAKE_DEPENDENT_OPTION option doc default depends force)
-  if(${option}_ISSET MATCHES "^${option}_ISSET$")
-    set(${option}_AVAILABLE 1)
-    foreach(d ${depends})
-      string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
-      if(${CMAKE_DEPENDENT_OPTION_DEP})
-      else()
-        set(${option}_AVAILABLE 0)
-      endif()
-    endforeach()
-    if(${option}_AVAILABLE)
-      option(${option} "${doc}" "${default}")
-      set(${option} "${${option}}" CACHE BOOL "${doc}" FORCE)
-    else()
-      if(${option} MATCHES "^${option}$")
-      else()
-        set(${option} "${${option}}" CACHE INTERNAL "${doc}")
-      endif()
-      set(${option} ${force})
-    endif()
-  else()
-    set(${option} "${${option}_ISSET}")
-  endif()
-endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineHIPCompiler.cmake b/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineHIPCompiler.cmake
deleted file mode 100644
index ed0110ae..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineHIPCompiler.cmake
+++ /dev/null
@@ -1,101 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
-include(${CMAKE_ROOT}/Modules/CMakeParseImplicitLinkInfo.cmake)
-
-if( NOT ( ("${CMAKE_GENERATOR}" MATCHES "Make") OR
-          ("${CMAKE_GENERATOR}" MATCHES "Ninja") ) )
-  message(FATAL_ERROR "HIP language not currently supported by \"${CMAKE_GENERATOR}\" generator")
-endif()
-
-
-if(NOT CMAKE_HIP_COMPILER)
-  set(CMAKE_HIP_COMPILER_INIT NOTFOUND)
-
-  # prefer the environment variable HIPCXX
-  if(NOT $ENV{HIPCXX} STREQUAL "")
-    get_filename_component(CMAKE_HIP_COMPILER_INIT $ENV{HIPCXX} PROGRAM PROGRAM_ARGS CMAKE_HIP_FLAGS_ENV_INIT)
-    if(CMAKE_HIP_FLAGS_ENV_INIT)
-      set(CMAKE_HIP_COMPILER_ARG1 "${CMAKE_HIP_FLAGS_ENV_INIT}" CACHE STRING "Arguments to CXX compiler")
-    endif()
-    if(NOT EXISTS ${CMAKE_HIP_COMPILER_INIT})
-      message(FATAL_ERROR "Could not find compiler set in environment variable HIPCXX:\n$ENV{HIPCXX}.\n${CMAKE_HIP_COMPILER_INIT}")
-    endif()
-  endif()
-
-  # finally list compilers to try
-  if(NOT CMAKE_HIP_COMPILER_INIT)
-    set(CMAKE_HIP_COMPILER_LIST hipcc clang++)
-  endif()
-
-  _cmake_find_compiler(HIP)
-else()
-  _cmake_find_compiler_path(HIP)
-endif()
-
-mark_as_advanced(CMAKE_HIP_COMPILER)
-
-# Build a small source file to identify the compiler.
-if(NOT CMAKE_HIP_COMPILER_ID_RUN)
-  set(CMAKE_HIP_COMPILER_ID_RUN 1)
-
-  # Try to identify the compiler.
-  set(CMAKE_HIP_COMPILER_ID)
-  set(CMAKE_HIP_PLATFORM_ID)
-  file(READ ${CMAKE_ROOT}/Modules/CMakePlatformId.h.in
-    CMAKE_HIP_COMPILER_ID_PLATFORM_CONTENT)
-
-  list(APPEND CMAKE_HIP_COMPILER_ID_TEST_FLAGS_FIRST "-v")
-
-  include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)
-  CMAKE_DETERMINE_COMPILER_ID(HIP HIPFLAGS CMakeHIPCompilerId.hip)
-
-  _cmake_find_compiler_sysroot(HIP)
-
-endif()
-
-if (NOT _CMAKE_TOOLCHAIN_LOCATION)
-  get_filename_component(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_HIP_COMPILER}" PATH)
-endif ()
-
-set(_CMAKE_PROCESSING_LANGUAGE "HIP")
-include(CMakeFindBinUtils)
-include(Compiler/${CMAKE_HIP_COMPILER_ID}-FindBinUtils OPTIONAL)
-unset(_CMAKE_PROCESSING_LANGUAGE)
-
-if(CMAKE_HIP_COMPILER_SYSROOT)
-  string(CONCAT _SET_CMAKE_HIP_COMPILER_SYSROOT
-    "set(CMAKE_HIP_COMPILER_SYSROOT \"${CMAKE_HIP_COMPILER_SYSROOT}\")\n"
-    "set(CMAKE_COMPILER_SYSROOT \"${CMAKE_HIP_COMPILER_SYSROOT}\")")
-else()
-  set(_SET_CMAKE_HIP_COMPILER_SYSROOT "")
-endif()
-
-if(CMAKE_HIP_COMPILER_ARCHITECTURE_ID)
-  set(_SET_CMAKE_HIP_COMPILER_ARCHITECTURE_ID
-    "set(CMAKE_HIP_COMPILER_ARCHITECTURE_ID ${CMAKE_HIP_COMPILER_ARCHITECTURE_ID})")
-else()
-  set(_SET_CMAKE_HIP_COMPILER_ARCHITECTURE_ID "")
-endif()
-
-if(MSVC_HIP_ARCHITECTURE_ID)
-  set(SET_MSVC_HIP_ARCHITECTURE_ID
-    "set(MSVC_HIP_ARCHITECTURE_ID ${MSVC_HIP_ARCHITECTURE_ID})")
-endif()
-
-if(NOT DEFINED CMAKE_HIP_ARCHITECTURES)
-  # Analyze output from hipcc to get the current GPU architecture.
-  if(CMAKE_HIP_COMPILER_PRODUCED_OUTPUT MATCHES " -target-cpu ([a-z0-9]+) ")
-    set(CMAKE_HIP_ARCHITECTURES "${CMAKE_MATCH_1}" CACHE STRING "HIP architectures")
-  else()
-    message(FATAL_ERROR "Failed to find a working HIP architecture.")
-  endif()
-endif()
-
-# configure variables set in this file for fast reload later on
-configure_file(${CMAKE_ROOT}/Modules/CMakeHIPCompiler.cmake.in
-  ${CMAKE_PLATFORM_INFO_DIR}/CMakeHIPCompiler.cmake
-  @ONLY
-  )
-set(CMAKE_HIP_COMPILER_ENV_VAR "HIPCXX")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPRuntime.cmake.in b/deps/cmake/share/cmake-3.21/Modules/CMakeHIPRuntime.cmake.in
deleted file mode 100644
index ade26bb9..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPRuntime.cmake.in
+++ /dev/null
@@ -1,99 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-
-function(_CMAKE_FIND_HIP_RUNTIME )
-  # Determined when hipcc is the HIP compiler
-  set(_CMAKE_HIP_COMPILER_ROCM_ROOT "@_CMAKE_HIP_COMPILER_ROCM_ROOT@")
-
-  # Forward facing value that can be provided by the user
-  set(CMAKE_HIP_COMPILER_TOOLKIT_ROOT @CMAKE_HIP_COMPILER_TOOLKIT_ROOT@)
-
-  if(NOT DEFINED _CMAKE_HIP_DEVICE_RUNTIME_TARGET)
-    set(message_on_found TRUE)
-  endif()
-
-  set(explicit_search_only FALSE)
-  set(rocm_root_dirs )
-  if(DEFINED CMAKE_HIP_COMPILER_TOOLKIT_ROOT)
-    set(rocm_root_dirs "${CMAKE_HIP_COMPILER_TOOLKIT_ROOT}")
-    set(explicit_search_only TRUE)
-    set(error_message_location "the variable CMAKE_HIP_COMPILER_TOOLKIT_ROOT [\"${CMAKE_HIP_COMPILER_TOOLKIT_ROOT}\"]")
-  elseif(DEFINED ENV{CMAKE_HIP_COMPILER_TOOLKIT_ROOT})
-    set(rocm_root_dirs "$ENV{CMAKE_HIP_COMPILER_TOOLKIT_ROOT}")
-    set(explicit_search_only TRUE)
-    set(error_message_location "CMAKE_HIP_COMPILER_TOOLKIT_ROOT")
-    set(error_message_location "the environment variable CMAKE_HIP_COMPILER_TOOLKIT_ROOT [\"$ENV{CMAKE_HIP_COMPILER_TOOLKIT_ROOT}\"]")
-  elseif(DEFINED _CMAKE_HIP_COMPILER_ROCM_ROOT)
-    set(rocm_root_dirs "${_CMAKE_HIP_COMPILER_ROCM_ROOT}")
-    set(explicit_search_only TRUE)
-    set(error_message_location "the associated hipconfig --rocmpath [\"${_CMAKE_HIP_COMPILER_ROCM_ROOT}\"]")
-  endif()
-
-  # Guess on where rocm is installed
-  if(NOT rocm_root_dirs AND (UNIX AND NOT APPLE))
-    set(platform_base "/opt/rocm-")
-
-    # Finad all default rocm installations
-    file(GLOB possible_paths "${platform_base}*")
-
-    set(versions)
-    foreach(p ${possible_paths})
-      # Extract version number from end of string
-      string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+$" p_version ${p})
-      if(IS_DIRECTORY ${p} AND p_version)
-        list(APPEND versions ${p_version})
-      endif()
-    endforeach()
-
-    # Sort numerically in descending order, so we try the newest versions first.
-    list(SORT versions COMPARE NATURAL ORDER DESCENDING)
-
-    # With a descending list of versions, populate possible paths to search.
-    set(rocm_root_dirs "/opt/rocm")
-    foreach(v IN LISTS versions)
-      list(APPEND rocm_root_dirs "${platform_base}${v}")
-    endforeach()
-  endif()
-
-  set(search_rel_path "/lib/cmake/hip-lang/")
-  list(TRANSFORM rocm_root_dirs APPEND "${search_rel_path}")
-
-  find_package(hip-lang
-    CONFIG
-    PATHS ${rocm_root_dirs}
-    QUIET
-    NO_DEFAULT_PATH
-  )
-  if(NOT DEFINED _CMAKE_HIP_DEVICE_RUNTIME_TARGET AND NOT explicit_search_only)
-    find_package(hip-lang CONFIG QUIET)
-  endif()
-
-  if(DEFINED _CMAKE_HIP_DEVICE_RUNTIME_TARGET)
-    set(CMAKE_HIP_RUNTIME_LIBRARIES_STATIC
-      ${CMAKE_HIP_RUNTIME_LIBRARIES_STATIC}
-      ${_CMAKE_HIP_DEVICE_RUNTIME_TARGET} PARENT_SCOPE)
-    set(CMAKE_HIP_RUNTIME_LIBRARIES_SHARED
-      ${CMAKE_HIP_RUNTIME_LIBRARIES_SHARED}
-      ${_CMAKE_HIP_DEVICE_RUNTIME_TARGET} PARENT_SCOPE)
-  endif()
-
-  if(DEFINED _CMAKE_HIP_DEVICE_RUNTIME_TARGET AND message_on_found)
-    message(STATUS "Found HIP runtime: ${hip-lang_DIR}")
-  elseif(NOT DEFINED _CMAKE_HIP_DEVICE_RUNTIME_TARGET)
-    if(explicit_search_only)
-      set(error_message "Failed to find the HIP runtime, Could not find hip-lang-config.cmake at the following location(s):\n")
-      foreach(p IN LISTS rocm_root_dirs)
-        string(APPEND error_message "\t${p}\n")
-      endforeach()
-      string(APPEND "which are computed from the location specified by ${error_message_location}. \
-        Please specify CMAKE_HIP_COMPILER_TOOLKIT_ROOT to the location of")
-      message(FATAL_ERROR "${error_message}")
-    else()
-      message(FATAL_ERROR
-        "Failed to find the HIP runtime, Could not find hip-lang-config.cmake.\
-        Try setting CMAKE_HIP_COMPILER_TOOLKIT_ROOT")
-    endif()
-  endif()
-
-endfunction()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ADSP-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ADSP-DetermineCompiler.cmake
deleted file mode 100644
index 0340f690..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ADSP-DetermineCompiler.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-
-set(_compiler_id_pp_test "defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__)")
-
-set(_compiler_id_version_compute "
-#if defined(__VISUALDSPVERSION__)
-  /* __VISUALDSPVERSION__ = 0xVVRRPP00 */
-# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__VISUALDSPVERSION__>>24)
-# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__VISUALDSPVERSION__>>16 & 0xFF)
-# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__VISUALDSPVERSION__>>8  & 0xFF)
-#endif")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-CXX.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-CXX.cmake
deleted file mode 100644
index 5dfb4011..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-CXX.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-include(Compiler/Clang-CXX)
-include(Compiler/ARMClang)
-__compiler_armclang(CXX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-ASM.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-ASM.cmake
deleted file mode 100644
index e3ca16ed..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-ASM.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-# This file is processed when the IAR compiler is used for an assembler file
-
-include(Compiler/IAR)
-
-if("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> -S <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_ilink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "RX")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> --silent <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_ilink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "RH850")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> --silent <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_ilink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "RL78")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> --silent <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_ilink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "RISC-V")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> --silent <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_ilink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> -S <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_xlink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s90;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> -S <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_xlink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s43;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "V850")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> -S <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_xlink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s85;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "8051")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> -S <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_xlink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s51;asm;msa)
-
-elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "STM8")
-  set(CMAKE_ASM_COMPILE_OBJECT  "<CMAKE_ASM_COMPILER> --silent <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
-  __compiler_iar_ilink(ASM)
-  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa)
-
-else()
-  message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID not detected. This should be automatic.")
-endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-DetermineCompiler.cmake
deleted file mode 100644
index 443b09c3..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-DetermineCompiler.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-# IAR Systems compiler for ARM embedded systems.
-#   http://www.iar.com
-#   http://supp.iar.com/FilesPublic/UPDINFO/004916/arm/doc/EWARM_DevelopmentGuide.ENU.pdf
-#
-# __IAR_SYSTEMS_ICC__ An integer that identifies the IAR compiler platform:
-#                       9 and higher means C11 and C++14 as language default
-#                       8 means C99 and C++03 as language default
-#                       7 and lower means C89 and EC++ as language default.
-# __ICCARM__          An integer that is set to 1 when the code is compiled with the IAR C/C++ Compiler for ARM
-# __VER__             An integer that identifies the version number of the IAR compiler in use. For example,
-#                     version 5.11.3 is returned as 5011003.
-#
-# IAR Systems Compiler for AVR embedded systems
-#  http://supp.iar.com/FilesPublic/UPDINFO/007051/ew/doc/EWAVR_CompilerReference.pdf
-#
-# __IAR_SYSTEMS_ICC__ An integer that identifies the IAR compiler platform.
-# __ICCAVR__          An integer that is set to 1 when the code is compiled with the IAR C/C++ Compiler for AVR
-# __VER__             An integer that identifies the version number of the IAR compiler in use.
-#                     The value is calculated by (100 * VERSION_MAJOR + VERSION_MINOR). For example the version
-#                     3.34 is given as 334
-# __SUBVERSION__      An integer that identifies the subversion number of the compiler version number
-#                     for example 3 in 1.2.3.4.  THis is used as the patch version, as seen when running iccavr
-#                     from the command line
-#
-
-set(_compiler_id_pp_test "defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)")
-
-set(_compiler_id_version_compute "
-# if defined(__VER__) && defined(__ICCARM__)
-#  define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@((__VER__) / 1000000)
-#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(((__VER__) / 1000) % 1000)
-#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@((__VER__) % 1000)
-#  define @PREFIX@COMPILER_VERSION_INTERNAL @MACRO_DEC@(__IAR_SYSTEMS_ICC__)
-# elif defined(__VER__) && (defined(__ICCAVR__) || defined(__ICCRX__) || defined(__ICCRH850__) || defined(__ICCRL78__) || defined(__ICC430__) || defined(__ICCRISCV__) || defined(__ICCV850__) || defined(__ICC8051__) || defined(__ICCSTM8__))
-#  define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@((__VER__) / 100)
-#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@((__VER__) - (((__VER__) / 100)*100))
-#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__SUBVERSION__)
-#  define @PREFIX@COMPILER_VERSION_INTERNAL @MACRO_DEC@(__IAR_SYSTEMS_ICC__)
-# endif")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-C.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-C.cmake
deleted file mode 100644
index 9a5104bd..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-C.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-include(Compiler/CMakeCommonCompilerMacros)
-
-if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27)
-  set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "")
-  set(CMAKE_C99_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "")
-  set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std:c11")
-  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std:c11")
-
-  __compiler_check_default_language_standard(C 19.27 99)
-else()
-  # MSVC has no specific options to set C language standards, but set them as
-  # empty strings anyways so the feature test infrastructure can at least check
-  # to see if they are defined.
-  set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "")
-  set(CMAKE_C99_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "")
-  set(CMAKE_C11_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "")
-
-  # There is no meaningful default for this
-  set(CMAKE_C_STANDARD_DEFAULT "")
-endif()
-
-set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -TC)
-set(CMAKE_C_CLANG_TIDY_DRIVER_MODE "cl")
-
-# There are no C compiler modes so we hard-code the known compiler supported
-# features. Override the default macro for this special case.  Pretend that
-# all language standards are available so that at least compilation
-# can be attempted.
-macro(cmake_record_c_compile_features)
-  list(APPEND CMAKE_C_COMPILE_FEATURES
-    c_std_90
-    c_std_99
-    c_std_11
-    c_function_prototypes
-    )
-  list(APPEND CMAKE_C90_COMPILE_FEATURES c_std_90 c_function_prototypes)
-  list(APPEND CMAKE_C99_COMPILE_FEATURES c_std_99)
-  list(APPEND CMAKE_C11_COMPILE_FEATURES c_std_11)
-  if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0)
-    list(APPEND CMAKE_C_COMPILE_FEATURES c_variadic_macros)
-    list(APPEND CMAKE_C99_COMPILE_FEATURES c_variadic_macros)
-  endif()
-  if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27)
-    list(APPEND CMAKE_C_COMPILE_FEATURES c_restrict)
-    list(APPEND CMAKE_C99_COMPILE_FEATURES c_restrict)
-  endif()
-  if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28)
-    list(APPEND CMAKE_C_COMPILE_FEATURES c_static_assert)
-    list(APPEND CMAKE_C11_COMPILE_FEATURES c_static_assert)
-  endif()
-  set(_result 0) # expected by cmake_determine_compile_features
-endmacro()
-
-# /JMC "Just My Code" is only supported by MSVC 19.05 onward.
-if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.05)
-  set(CMAKE_C_COMPILE_OPTIONS_JMC "-JMC")
-endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-C.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-C.cmake
deleted file mode 100644
index a734edf1..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-C.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-include(Compiler/PGI-C)
-include(Compiler/NVHPC)
-
-# Needed so that we support `LANGUAGE` property correctly
-set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c)
-
-# Required since as of NVHPC 21.03 the `-MD` flag implicitly
-# implies `-E` and therefore compilation and dependency generation
-# can't occur in the same invocation
-set(CMAKE_C_DEPENDS_EXTRA_COMMANDS "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -x c -M <SOURCE> -MT <OBJECT> -MD<DEP_FILE>")
-
-__compiler_nvhpc(C)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-CXX.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-CXX.cmake
deleted file mode 100644
index 98d00225..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-CXX.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-include(Compiler/PGI-CXX)
-include(Compiler/NVHPC)
-
-# Needed so that we support `LANGUAGE` property correctly
-set(CMAKE_CXX_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c++)
-
-# Required since as of NVHPC 21.03 the `-MD` flag implicitly
-# implies `-E` and therefore compilation and dependency generation
-# can't occur in the same invocation
-set(CMAKE_CXX_DEPENDS_EXTRA_COMMANDS "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -x c++ -M <SOURCE> -MT <OBJECT> -MD<DEP_FILE>")
-
-__compiler_nvhpc(CXX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-ASM.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-ASM.cmake
deleted file mode 100644
index 85d1110a..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-ASM.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Compiler/ROCMClang)
-__compiler_rocmclang(ASM)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-C.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-C.cmake
deleted file mode 100644
index cdfa95d9..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-C.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-include(Compiler/ROCMClang)
-__compiler_rocmclang(C)
-
-set(_rocm_clang_ver "${CMAKE_C_COMPILER_VERSION_INTERNAL}")
-set(CMAKE_C_COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION_INTERNAL}")
-include(Compiler/Clang-C)
-set(CMAKE_C_COMPILER_VERSION "${_rocm_clang_ver}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-CXX.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-CXX.cmake
deleted file mode 100644
index 5739c8e5..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-CXX.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-include(Compiler/ROCMClang)
-__compiler_rocmclang(CXX)
-
-set(_rocm_clang_ver "${CMAKE_CXX_COMPILER_VERSION_INTERNAL}")
-set(CMAKE_CXX_COMPILER_VERSION "${CMAKE_CXX_COMPILER_VERSION_INTERNAL}")
-include(Compiler/Clang-CXX)
-set(CMAKE_CXX_COMPILER_VERSION "${_rocm_clang_ver}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-DetermineCompiler.cmake
deleted file mode 100644
index c2fc99b6..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-DetermineCompiler.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-
-set(_compiler_id_pp_test "defined(__clang__) && __has_include(<hip/hip_version.h>)")
-
-set(_compiler_id_version_compute "
-# if defined(__clang__) && __has_include(<hip/hip_version.h>)
-#  include <hip/hip_version.h>
-#  define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(HIP_VERSION_MAJOR)
-#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(HIP_VERSION_MINOR)
-#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(HIP_VERSION_PATCH)
-# endif")
-
-set(_compiler_id_simulate "
-# if defined(_MSC_VER)
-#  define @PREFIX@SIMULATE_ID \"MSVC\"
-# elif defined(__clang__)
-#  define @PREFIX@SIMULATE_ID \"Clang\"
-# elif defined(__GNUC__)
-#  define @PREFIX@SIMULATE_ID \"GNU\"
-# endif")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-FindBinUtils.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-FindBinUtils.cmake
deleted file mode 100644
index e721c870..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-FindBinUtils.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include(Compiler/Clang-FindBinUtils)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-HIP.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-HIP.cmake
deleted file mode 100644
index 7af76998..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-HIP.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-include(Compiler/ROCMClang)
-__compiler_rocmclang(HIP)
-
-set(_CMAKE_COMPILE_AS_HIP_FLAG "-x hip")
-set(_CMAKE_HIP_RDC_FLAG "-fgpu-rdc")
-
-if(NOT "x${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "xMSVC")
-  set(CMAKE_HIP_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
-  string(APPEND CMAKE_HIP_FLAGS_DEBUG_INIT " -O")
-endif()
-
-if(CMAKE_HIP_SIMULATE_ID STREQUAL "GNU")
-  set(CMAKE_HIP_LINKER_WRAPPER_FLAG "-Wl,")
-  set(CMAKE_HIP_LINKER_WRAPPER_FLAG_SEP ",")
-elseif(CMAKE_HIP_SIMULATE_ID STREQUAL "Clang")
-  set(CMAKE_HIP_LINKER_WRAPPER_FLAG "-Xlinker" " ")
-  set(CMAKE_HIP_LINKER_WRAPPER_FLAG_SEP)
-endif()
-
-if(NOT CMAKE_HIP_COMPILER_VERSION VERSION_LESS 1.0)
-  set(CMAKE_HIP98_STANDARD_COMPILE_OPTION "-std=c++98")
-  set(CMAKE_HIP98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
-  set(CMAKE_HIP98_STANDARD__HAS_FULL_SUPPORT ON)
-
-  set(CMAKE_HIP11_STANDARD_COMPILE_OPTION "-std=c++11")
-  set(CMAKE_HIP11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
-  set(CMAKE_HIP11_STANDARD__HAS_FULL_SUPPORT ON)
-
-  set(CMAKE_HIP14_STANDARD_COMPILE_OPTION "-std=c++14")
-  set(CMAKE_HIP14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
-  set(CMAKE_HIP14_STANDARD__HAS_FULL_SUPPORT ON)
-
-  set(CMAKE_HIP17_STANDARD_COMPILE_OPTION "-std=c++17")
-  set(CMAKE_HIP17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
-  set(CMAKE_HIP17_STANDARD__HAS_FULL_SUPPORT ON)
-
-  set(CMAKE_HIP20_STANDARD_COMPILE_OPTION "-std=c++20")
-  set(CMAKE_HIP20_EXTENSION_COMPILE_OPTION "-std=gnu++20")
-endif()
-
-set(CMAKE_HIP_RUNTIME_LIBRARY_DEFAULT "SHARED")
-set(CMAKE_HIP_RUNTIME_LIBRARY_LINK_OPTIONS_STATIC  "")
-set(CMAKE_HIP_RUNTIME_LIBRARY_LINK_OPTIONS_SHARED  "")
-
-# Populated by CMakeHIPRuntime.cmake
-set(CMAKE_HIP_RUNTIME_LIBRARIES_STATIC "")
-set(CMAKE_HIP_RUNTIME_LIBRARIES_SHARED "")
-
-__compiler_check_default_language_standard(HIP 3.5 11)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-OBJC.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-OBJC.cmake
deleted file mode 100644
index 794973d3..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-OBJC.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-include(Compiler/ROCMClang)
-__compiler_rocmclang(OBJC)
-
-set(_rocm_clang_ver "${CMAKE_OBJC_COMPILER_VERSION_INTERNAL}")
-set(CMAKE_OBJC_COMPILER_VERSION "${CMAKE_OBJC_COMPILER_VERSION_INTERNAL}")
-include(Compiler/Clang-OBJC)
-set(CMAKE_OBJC_COMPILER_VERSION "${_rocm_clang_ver}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-OBJCXX.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-OBJCXX.cmake
deleted file mode 100644
index 82238e16..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang-OBJCXX.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-include(Compiler/ROCMClang)
-__compiler_rocmclang(OBJCXX)
-
-set(_rocm_clang_ver "${CMAKE_OBJCXX_COMPILER_VERSION_INTERNAL}")
-set(CMAKE_OBJCXX_COMPILER_VERSION "${CMAKE_OBJCXX_COMPILER_VERSION_INTERNAL}")
-include(Compiler/Clang-OBJCXX)
-set(CMAKE_OBJCXX_COMPILER_VERSION "${_rocm_clang_ver}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang.cmake b/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang.cmake
deleted file mode 100644
index 6b38c2d4..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ROCMClang.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-
-# This module is shared by multiple languages; use include blocker.
-include_guard()
-
-include(Compiler/CMakeCommonCompilerMacros)
-
-macro(__compiler_rocmclang lang)
-
-  set(CMAKE_${lang}_VERBOSE_FLAG "-v")
-
-  if(NOT "x${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "xMSVC")
-    # Feature flags.
-    set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
-    set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
-    set(CMAKE_HIP_COMPILE_OPTIONS_VISIBILITY -fvisibility=)
-
-    string(APPEND CMAKE_HIP_FLAGS_INIT " ")
-    string(APPEND CMAKE_HIP_FLAGS_DEBUG_INIT " -g")
-    string(APPEND CMAKE_HIP_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
-    string(APPEND CMAKE_HIP_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
-    string(APPEND CMAKE_HIP_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
-  endif()
-
-  set(CMAKE_SHARED_LIBRARY_CREATE_HIP_FLAGS -shared)
-  set(CMAKE_INCLUDE_SYSTEM_FLAG_HIP "-isystem ")
-
-  set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-  set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_LIBRARIES 1)
-  set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-  set(CMAKE_${lang}_RESPONSE_FILE_FLAG "@")
-  set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "@")
-endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FetchContent.cmake b/deps/cmake/share/cmake-3.21/Modules/FetchContent.cmake
deleted file mode 100644
index bd82a90e..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/FetchContent.cmake
+++ /dev/null
@@ -1,1224 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FetchContent
-------------------
-
-.. versionadded:: 3.11
-
-.. only:: html
-
-  .. contents::
-
-Overview
-^^^^^^^^
-
-This module enables populating content at configure time via any method
-supported by the :module:`ExternalProject` module.  Whereas
-:command:`ExternalProject_Add` downloads at build time, the
-``FetchContent`` module makes content available immediately, allowing the
-configure step to use the content in commands like :command:`add_subdirectory`,
-:command:`include` or :command:`file` operations.
-
-Content population details would normally be defined separately from the
-command that performs the actual population.  This separation ensures that
-all of the dependency details are defined before anything may try to use those
-details to populate content.  This is particularly important in more complex
-project hierarchies where dependencies may be shared between multiple projects.
-
-The following shows a typical example of declaring content details:
-
-.. code-block:: cmake
-
-  FetchContent_Declare(
-    googletest
-    GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
-  )
-
-For most typical cases, populating the content can then be done with a single
-command like so:
-
-.. code-block:: cmake
-
-  FetchContent_MakeAvailable(googletest)
-
-The above command not only populates the content, it also adds it to the main
-build (if possible) so that the main build can use the populated project's
-targets, etc.  In some cases, the main project may need to have more precise
-control over the population or may be required to explicitly define the
-population steps (e.g. if CMake versions earlier than 3.14 need to be
-supported).  The typical pattern of such custom steps looks like this:
-
-.. code-block:: cmake
-
-  FetchContent_GetProperties(googletest)
-  if(NOT googletest_POPULATED)
-    FetchContent_Populate(googletest)
-    add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
-  endif()
-
-Regardless of which population method is used, when using the
-declare-populate pattern with a hierarchical project arrangement, projects at
-higher levels in the hierarchy are able to override the population details of
-content specified anywhere lower in the project hierarchy.  The ability to
-detect whether content has already been populated ensures that even if
-multiple child projects want certain content to be available, the first one
-to populate it wins.  The other child project can simply make use of the
-already available content instead of repeating the population for itself.
-See the :ref:`Examples <fetch-content-examples>` section which demonstrates
-this scenario.
-
-The ``FetchContent`` module also supports defining and populating
-content in a single call, with no check for whether the content has been
-populated elsewhere in the project already.  This is a more low level
-operation and would not normally be the way the module is used, but it is
-sometimes useful as part of implementing some higher level feature or to
-populate some content in CMake's script mode.
-
-.. versionchanged:: 3.14
-  ``FetchContent`` commands can access the terminal. This is necessary
-  for password prompts and real-time progress displays to work.
-
-Commands
-^^^^^^^^
-
-Declaring Content Details
-"""""""""""""""""""""""""
-
-.. command:: FetchContent_Declare
-
-  .. code-block:: cmake
-
-    FetchContent_Declare(<name> <contentOptions>...)
-
-  The ``FetchContent_Declare()`` function records the options that describe
-  how to populate the specified content, but if such details have already
-  been recorded earlier in this project (regardless of where in the project
-  hierarchy), this and all later calls for the same content ``<name>`` are
-  ignored.  This "first to record, wins" approach is what allows hierarchical
-  projects to have parent projects override content details of child projects.
-
-  The content ``<name>`` can be any string without spaces, but good practice
-  would be to use only letters, numbers and underscores.  The name will be
-  treated case-insensitively and it should be obvious for the content it
-  represents, often being the name of the child project or the value given
-  to its top level :command:`project` command (if it is a CMake project).
-  For well-known public projects, the name should generally be the official
-  name of the project.  Choosing an unusual name makes it unlikely that other
-  projects needing that same content will use the same name, leading to
-  the content being populated multiple times.
-
-  The ``<contentOptions>`` can be any of the download or update/patch options
-  that the :command:`ExternalProject_Add` command understands.  The configure,
-  build, install and test steps are explicitly disabled and therefore options
-  related to them will be ignored.  The ``SOURCE_SUBDIR`` option is an
-  exception, see :command:`FetchContent_MakeAvailable` for details on how that
-  affects behavior.
-
-  In most cases, ``<contentOptions>`` will just be a couple of options defining
-  the download method and method-specific details like a commit tag or archive
-  hash.  For example:
-
-  .. code-block:: cmake
-
-    FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY https://github.com/google/googletest.git
-      GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
-    )
-
-    FetchContent_Declare(
-      myCompanyIcons
-      URL      https://intranet.mycompany.com/assets/iconset_1.12.tar.gz
-      URL_HASH MD5=5588a7b18261c20068beabfb4f530b87
-    )
-
-    FetchContent_Declare(
-      myCompanyCertificates
-      SVN_REPOSITORY svn+ssh://svn.mycompany.com/srv/svn/trunk/certs
-      SVN_REVISION   -r12345
-    )
-
-  Where contents are being fetched from a remote location and you do not
-  control that server, it is advisable to use a hash for ``GIT_TAG`` rather
-  than a branch or tag name.  A commit hash is more secure and helps to
-  confirm that the downloaded contents are what you expected.
-
-Populating The Content
-""""""""""""""""""""""
-
-For most common scenarios, population means making content available to the
-main build according to previously declared details for that dependency.
-There are two main patterns for populating content, one based on calling
-:command:`FetchContent_GetProperties` and
-:command:`FetchContent_Populate` for more precise control and the other on
-calling :command:`FetchContent_MakeAvailable` for a simpler, more automated
-approach.  The former generally follows this canonical pattern:
-
-.. _`fetch-content-canonical-pattern`:
-
-.. code-block:: cmake
-
-  # Check if population has already been performed
-  FetchContent_GetProperties(<name>)
-  string(TOLOWER "<name>" lcName)
-  if(NOT ${lcName}_POPULATED)
-    # Fetch the content using previously declared details
-    FetchContent_Populate(<name>)
-
-    # Set custom variables, policies, etc.
-    # ...
-
-    # Bring the populated content into the build
-    add_subdirectory(${${lcName}_SOURCE_DIR} ${${lcName}_BINARY_DIR})
-  endif()
-
-The above is such a common pattern that, where no custom steps are needed
-between the calls to :command:`FetchContent_Populate` and
-:command:`add_subdirectory`, equivalent logic can be obtained by calling
-:command:`FetchContent_MakeAvailable` instead.  Where it meets the needs of
-the project, :command:`FetchContent_MakeAvailable` should be preferred, as it
-is simpler and provides additional features over the pattern above.
-
-.. command:: FetchContent_Populate
-
-  .. code-block:: cmake
-
-    FetchContent_Populate( <name> )
-
-  In most cases, the only argument given to ``FetchContent_Populate()`` is the
-  ``<name>``.  When used this way, the command assumes the content details have
-  been recorded by an earlier call to :command:`FetchContent_Declare`.  The
-  details are stored in a global property, so they are unaffected by things
-  like variable or directory scope.  Therefore, it doesn't matter where in the
-  project the details were previously declared, as long as they have been
-  declared before the call to ``FetchContent_Populate()``.  Those saved details
-  are then used to construct a call to :command:`ExternalProject_Add` in a
-  private sub-build to perform the content population immediately.  The
-  implementation of ``ExternalProject_Add()`` ensures that if the content has
-  already been populated in a previous CMake run, that content will be reused
-  rather than repopulating them again.  For the common case where population
-  involves downloading content, the cost of the download is only paid once.
-
-  An internal global property records when a particular content population
-  request has been processed.  If ``FetchContent_Populate()`` is called more
-  than once for the same content name within a configure run, the second call
-  will halt with an error.  Projects can and should check whether content
-  population has already been processed with the
-  :command:`FetchContent_GetProperties` command before calling
-  ``FetchContent_Populate()``.
-
-  ``FetchContent_Populate()`` will set three variables in the scope of the
-  caller; ``<lcName>_POPULATED``, ``<lcName>_SOURCE_DIR`` and
-  ``<lcName>_BINARY_DIR``, where ``<lcName>`` is the lowercased ``<name>``.
-  ``<lcName>_POPULATED`` will always be set to ``True`` by the call.
-  ``<lcName>_SOURCE_DIR`` is the location where the
-  content can be found upon return (it will have already been populated), while
-  ``<lcName>_BINARY_DIR`` is a directory intended for use as a corresponding
-  build directory.  The main use case for the two directory variables is to
-  call :command:`add_subdirectory` immediately after population, i.e.:
-
-  .. code-block:: cmake
-
-    FetchContent_Populate(FooBar ...)
-    add_subdirectory(${foobar_SOURCE_DIR} ${foobar_BINARY_DIR})
-
-  The values of the three variables can also be retrieved from anywhere in the
-  project hierarchy using the :command:`FetchContent_GetProperties` command.
-
-  A number of cache variables influence the behavior of all content population
-  performed using details saved from a :command:`FetchContent_Declare` call:
-
-  ``FETCHCONTENT_BASE_DIR``
-    In most cases, the saved details do not specify any options relating to the
-    directories to use for the internal sub-build, final source and build areas.
-    It is generally best to leave these decisions up to the ``FetchContent``
-    module to handle on the project's behalf.  The ``FETCHCONTENT_BASE_DIR``
-    cache variable controls the point under which all content population
-    directories are collected, but in most cases developers would not need to
-    change this.  The default location is ``${CMAKE_BINARY_DIR}/_deps``, but if
-    developers change this value, they should aim to keep the path short and
-    just below the top level of the build tree to avoid running into path
-    length problems on Windows.
-
-  ``FETCHCONTENT_QUIET``
-    The logging output during population can be quite verbose, making the
-    configure stage quite noisy.  This cache option (``ON`` by default) hides
-    all population output unless an error is encountered.  If experiencing
-    problems with hung downloads, temporarily switching this option off may
-    help diagnose which content population is causing the issue.
-
-  ``FETCHCONTENT_FULLY_DISCONNECTED``
-    When this option is enabled, no attempt is made to download or update
-    any content.  It is assumed that all content has already been populated in
-    a previous run or the source directories have been pointed at existing
-    contents the developer has provided manually (using options described
-    further below).  When the developer knows that no changes have been made to
-    any content details, turning this option ``ON`` can significantly speed up
-    the configure stage.  It is ``OFF`` by default.
-
-  ``FETCHCONTENT_UPDATES_DISCONNECTED``
-    This is a less severe download/update control compared to
-    ``FETCHCONTENT_FULLY_DISCONNECTED``.  Instead of bypassing all download and
-    update logic, the ``FETCHCONTENT_UPDATES_DISCONNECTED`` only disables the
-    update stage.  Therefore, if content has not been downloaded previously,
-    it will still be downloaded when this option is enabled.  This can speed up
-    the configure stage, but not as much as
-    ``FETCHCONTENT_FULLY_DISCONNECTED``.  It is ``OFF`` by default.
-
-  In addition to the above cache variables, the following cache variables are
-  also defined for each content name (``<ucName>`` is the uppercased value of
-  ``<name>``):
-
-  ``FETCHCONTENT_SOURCE_DIR_<ucName>``
-    If this is set, no download or update steps are performed for the specified
-    content and the ``<lcName>_SOURCE_DIR`` variable returned to the caller is
-    pointed at this location.  This gives developers a way to have a separate
-    checkout of the content that they can modify freely without interference
-    from the build.  The build simply uses that existing source, but it still
-    defines ``<lcName>_BINARY_DIR`` to point inside its own build area.
-    Developers are strongly encouraged to use this mechanism rather than
-    editing the sources populated in the default location, as changes to
-    sources in the default location can be lost when content population details
-    are changed by the project.
-
-  ``FETCHCONTENT_UPDATES_DISCONNECTED_<ucName>``
-    This is the per-content equivalent of
-    ``FETCHCONTENT_UPDATES_DISCONNECTED``. If the global option or this option
-    is ``ON``, then updates will be disabled for the named content.
-    Disabling updates for individual content can be useful for content whose
-    details rarely change, while still leaving other frequently changing
-    content with updates enabled.
-
-
-  The ``FetchContent_Populate()`` command also supports a syntax allowing the
-  content details to be specified directly rather than using any saved
-  details.  This is more low-level and use of this form is generally to be
-  avoided in favor of using saved content details as outlined above.
-  Nevertheless, in certain situations it can be useful to invoke the content
-  population as an isolated operation (typically as part of implementing some
-  other higher level feature or when using CMake in script mode):
-
-  .. code-block:: cmake
-
-    FetchContent_Populate( <name>
-      [QUIET]
-      [SUBBUILD_DIR <subBuildDir>]
-      [SOURCE_DIR <srcDir>]
-      [BINARY_DIR <binDir>]
-      ...
-    )
-
-  This form has a number of key differences to that where only ``<name>`` is
-  provided:
-
-  - All required population details are assumed to have been provided directly
-    in the call to ``FetchContent_Populate()``. Any saved details for
-    ``<name>`` are ignored.
-  - No check is made for whether content for ``<name>`` has already been
-    populated.
-  - No global property is set to record that the population has occurred.
-  - No global properties record the source or binary directories used for the
-    populated content.
-  - The ``FETCHCONTENT_FULLY_DISCONNECTED`` and
-    ``FETCHCONTENT_UPDATES_DISCONNECTED`` cache variables are ignored.
-
-  The ``<lcName>_SOURCE_DIR`` and ``<lcName>_BINARY_DIR`` variables are still
-  returned to the caller, but since these locations are not stored as global
-  properties when this form is used, they are only available to the calling
-  scope and below rather than the entire project hierarchy.  No
-  ``<lcName>_POPULATED`` variable is set in the caller's scope with this form.
-
-  The supported options for ``FetchContent_Populate()`` are the same as those
-  for :command:`FetchContent_Declare()`.  Those few options shown just
-  above are either specific to ``FetchContent_Populate()`` or their behavior is
-  slightly modified from how :command:`ExternalProject_Add` treats them.
-
-  ``QUIET``
-    The ``QUIET`` option can be given to hide the output associated with
-    populating the specified content.  If the population fails, the output will
-    be shown regardless of whether this option was given or not so that the
-    cause of the failure can be diagnosed.  The global ``FETCHCONTENT_QUIET``
-    cache variable has no effect on ``FetchContent_Populate()`` calls where the
-    content details are provided directly.
-
-  ``SUBBUILD_DIR``
-    The ``SUBBUILD_DIR`` argument can be provided to change the location of the
-    sub-build created to perform the population.  The default value is
-    ``${CMAKE_CURRENT_BINARY_DIR}/<lcName>-subbuild`` and it would be unusual
-    to need to override this default.  If a relative path is specified, it will
-    be interpreted as relative to :variable:`CMAKE_CURRENT_BINARY_DIR`.
-    This option should not be confused with the ``SOURCE_SUBDIR`` option which
-    only affects the :command:`FetchContent_MakeAvailable` command.
-
-  ``SOURCE_DIR``, ``BINARY_DIR``
-    The ``SOURCE_DIR`` and ``BINARY_DIR`` arguments are supported by
-    :command:`ExternalProject_Add`, but different default values are used by
-    ``FetchContent_Populate()``.  ``SOURCE_DIR`` defaults to
-    ``${CMAKE_CURRENT_BINARY_DIR}/<lcName>-src`` and ``BINARY_DIR`` defaults to
-    ``${CMAKE_CURRENT_BINARY_DIR}/<lcName>-build``.  If a relative path is
-    specified, it will be interpreted as relative to
-    :variable:`CMAKE_CURRENT_BINARY_DIR`.
-
-  In addition to the above explicit options, any other unrecognized options are
-  passed through unmodified to :command:`ExternalProject_Add` to perform the
-  download, patch and update steps.  The following options are explicitly
-  prohibited (they are disabled by the ``FetchContent_Populate()`` command):
-
-  - ``CONFIGURE_COMMAND``
-  - ``BUILD_COMMAND``
-  - ``INSTALL_COMMAND``
-  - ``TEST_COMMAND``
-
-  If using ``FetchContent_Populate()`` within CMake's script mode, be aware
-  that the implementation sets up a sub-build which therefore requires a CMake
-  generator and build tool to be available. If these cannot be found by
-  default, then the :variable:`CMAKE_GENERATOR` and/or
-  :variable:`CMAKE_MAKE_PROGRAM` variables will need to be set appropriately
-  on the command line invoking the script.
-
-  .. versionadded:: 3.18
-    Added support for ``DOWNLOAD_NO_EXTRACT`` and ``SOURCE_SUBDIR`` options.
-
-.. command:: FetchContent_GetProperties
-
-  When using saved content details, a call to :command:`FetchContent_Populate`
-  records information in global properties which can be queried at any time.
-  This information includes the source and binary directories associated with
-  the content and also whether or not the content population has been processed
-  during the current configure run.
-
-  .. code-block:: cmake
-
-    FetchContent_GetProperties( <name>
-      [SOURCE_DIR <srcDirVar>]
-      [BINARY_DIR <binDirVar>]
-      [POPULATED <doneVar>]
-    )
-
-  The ``SOURCE_DIR``, ``BINARY_DIR`` and ``POPULATED`` options can be used to
-  specify which properties should be retrieved.  Each option accepts a value
-  which is the name of the variable in which to store that property.  Most of
-  the time though, only ``<name>`` is given, in which case the call will then
-  set the same variables as a call to
-  :command:`FetchContent_Populate(name) <FetchContent_Populate>`.  This allows
-  the following canonical pattern to be used, which ensures that the relevant
-  variables will always be defined regardless of whether or not the population
-  has been performed elsewhere in the project already:
-
-  .. code-block:: cmake
-
-    FetchContent_GetProperties(foobar)
-    if(NOT foobar_POPULATED)
-      FetchContent_Populate(foobar)
-      ...
-    endif()
-
-  The above pattern allows other parts of the overall project hierarchy to
-  re-use the same content and ensure that it is only populated once.
-
-
-.. command:: FetchContent_MakeAvailable
-
-  .. code-block:: cmake
-
-    FetchContent_MakeAvailable( <name1> [<name2>...] )
-
-  .. versionadded:: 3.14
-
-  This command implements the common pattern typically needed for most
-  dependencies.  It iterates over each of the named dependencies in turn
-  and for each one it loosely follows the
-  :ref:`canonical pattern <fetch-content-canonical-pattern>` as
-  presented at the beginning of this section.  An important difference is
-  that :command:`add_subdirectory` will only be called on the
-  populated content if there is a ``CMakeLists.txt`` file in its top level
-  source directory.  This allows the command to be used for dependencies
-  that make downloaded content available at a known location but which do
-  not need or support being added directly to the build.
-
-  The ``SOURCE_SUBDIR`` option can be given in the declared details to
-  instruct ``FetchContent_MakeAvailable()`` to look for a ``CMakeLists.txt``
-  file in a subdirectory below the top level (i.e. the same way that
-  ``SOURCE_SUBDIR`` is used by the :command:`ExternalProject_Add` command).
-  ``SOURCE_SUBDIR`` must always be a relative path.  See the next section
-  for an example of this option.
-
-
-.. _`fetch-content-examples`:
-
-Examples
-^^^^^^^^
-
-This first fairly straightforward example ensures that some popular testing
-frameworks are available to the main build:
-
-.. code-block:: cmake
-
-  include(FetchContent)
-  FetchContent_Declare(
-    googletest
-    GIT_REPOSITORY https://github.com/google/googletest.git
-    GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
-  )
-  FetchContent_Declare(
-    Catch2
-    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG        de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4
-  )
-
-  # After the following call, the CMake targets defined by googletest and
-  # Catch2 will be defined and available to the rest of the build
-  FetchContent_MakeAvailable(googletest Catch2)
-
-If the sub-project's ``CMakeLists.txt`` file is not at the top level of its
-source tree, the ``SOURCE_SUBDIR`` option can be used to tell ``FetchContent``
-where to find it.  The following example shows how to use that option and
-it also sets a variable which is meaningful to the subproject before pulling
-it into the main build:
-
-.. code-block:: cmake
-
-  include(FetchContent)
-  FetchContent_Declare(
-    protobuf
-    GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git
-    GIT_TAG        ae50d9b9902526efd6c7a1907d09739f959c6297 # v3.15.0
-    SOURCE_SUBDIR  cmake
-  )
-  set(protobuf_BUILD_TESTS OFF)
-  FetchContent_MakeAvailable(protobuf)
-
-In more complex project hierarchies, the dependency relationships can be more
-complicated.  Consider a hierarchy where ``projA`` is the top level project and
-it depends directly on projects ``projB`` and ``projC``.  Both ``projB`` and
-``projC`` can be built standalone and they also both depend on another project
-``projD``.  ``projB`` additionally depends on ``projE``.  This example assumes
-that all five projects are available on a company git server.  The
-``CMakeLists.txt`` of each project might have sections like the following:
-
-*projA*:
-
-.. code-block:: cmake
-
-  include(FetchContent)
-  FetchContent_Declare(
-    projB
-    GIT_REPOSITORY git@mycompany.com:git/projB.git
-    GIT_TAG        4a89dc7e24ff212a7b5167bef7ab079d
-  )
-  FetchContent_Declare(
-    projC
-    GIT_REPOSITORY git@mycompany.com:git/projC.git
-    GIT_TAG        4ad4016bd1d8d5412d135cf8ceea1bb9
-  )
-  FetchContent_Declare(
-    projD
-    GIT_REPOSITORY git@mycompany.com:git/projD.git
-    GIT_TAG        origin/integrationBranch
-  )
-  FetchContent_Declare(
-    projE
-    GIT_REPOSITORY git@mycompany.com:git/projE.git
-    GIT_TAG        v2.3-rc1
-  )
-
-  # Order is important, see notes in the discussion further below
-  FetchContent_MakeAvailable(projD projB projC)
-
-*projB*:
-
-.. code-block:: cmake
-
-  include(FetchContent)
-  FetchContent_Declare(
-    projD
-    GIT_REPOSITORY git@mycompany.com:git/projD.git
-    GIT_TAG        20b415f9034bbd2a2e8216e9a5c9e632
-  )
-  FetchContent_Declare(
-    projE
-    GIT_REPOSITORY git@mycompany.com:git/projE.git
-    GIT_TAG        68e20f674a48be38d60e129f600faf7d
-  )
-
-  FetchContent_MakeAvailable(projD projE)
-
-*projC*:
-
-.. code-block:: cmake
-
-  include(FetchContent)
-  FetchContent_Declare(
-    projD
-    GIT_REPOSITORY git@mycompany.com:git/projD.git
-    GIT_TAG        7d9a17ad2c962aa13e2fbb8043fb6b8a
-  )
-
-  # This particular version of projD requires workarounds
-  FetchContent_GetProperties(projD)
-  if(NOT projd_POPULATED)
-    FetchContent_Populate(projD)
-
-    # Copy an additional/replacement file into the populated source
-    file(COPY someFile.c DESTINATION ${projd_SOURCE_DIR}/src)
-
-    add_subdirectory(${projd_SOURCE_DIR} ${projd_BINARY_DIR})
-  endif()
-
-A few key points should be noted in the above:
-
-- ``projB`` and ``projC`` define different content details for ``projD``,
-  but ``projA`` also defines a set of content details for ``projD``.
-  Because ``projA`` will define them first, the details from ``projB`` and
-  ``projC`` will not be used.  The override details defined by ``projA``
-  are not required to match either of those from ``projB`` or ``projC``, but
-  it is up to the higher level project to ensure that the details it does
-  define still make sense for the child projects.
-- In the ``projA`` call to :command:`FetchContent_MakeAvailable`, ``projD``
-  is listed ahead of ``projB`` and ``projC`` to ensure that ``projA`` is in
-  control of how ``projD`` is populated.
-- While ``projA`` defines content details for ``projE``, it does not need
-  to explicitly call ``FetchContent_MakeAvailable(projE)`` or
-  ``FetchContent_Populate(projD)`` itself.  Instead, it leaves that to the
-  child ``projB``.  For higher level projects, it is often enough to just
-  define the override content details and leave the actual population to the
-  child projects.  This saves repeating the same thing at each level of the
-  project hierarchy unnecessarily.
-
-
-Projects don't always need to add the populated content to the build.
-Sometimes the project just wants to make the downloaded content available at
-a predictable location.  The next example ensures that a set of standard
-company toolchain files (and potentially even the toolchain binaries
-themselves) is available early enough to be used for that same build.
-
-.. code-block:: cmake
-
-  cmake_minimum_required(VERSION 3.14)
-
-  include(FetchContent)
-  FetchContent_Declare(
-    mycom_toolchains
-    URL  https://intranet.mycompany.com//toolchains_1.3.2.tar.gz
-  )
-  FetchContent_MakeAvailable(mycom_toolchains)
-
-  project(CrossCompileExample)
-
-The project could be configured to use one of the downloaded toolchains like
-so:
-
-.. code-block:: shell
-
-  cmake -DCMAKE_TOOLCHAIN_FILE=_deps/mycom_toolchains-src/toolchain_arm.cmake /path/to/src
-
-When CMake processes the ``CMakeLists.txt`` file, it will download and unpack
-the tarball into ``_deps/mycompany_toolchains-src`` relative to the build
-directory.  The :variable:`CMAKE_TOOLCHAIN_FILE` variable is not used until
-the :command:`project` command is reached, at which point CMake looks for the
-named toolchain file relative to the build directory.  Because the tarball has
-already been downloaded and unpacked by then, the toolchain file will be in
-place, even the very first time that ``cmake`` is run in the build directory.
-
-Lastly, the following example demonstrates how one might download and unpack a
-firmware tarball using CMake's :manual:`script mode <cmake(1)>`.  The call to
-:command:`FetchContent_Populate` specifies all the content details and the
-unpacked firmware will be placed in a ``firmware`` directory below the
-current working directory.
-
-*getFirmware.cmake*:
-
-.. code-block:: cmake
-
-  # NOTE: Intended to be run in script mode with cmake -P
-  include(FetchContent)
-  FetchContent_Populate(
-    firmware
-    URL        https://mycompany.com/assets/firmware-1.23-arm.tar.gz
-    URL_HASH   MD5=68247684da89b608d466253762b0ff11
-    SOURCE_DIR firmware
-  )
-
-#]=======================================================================]
-
-#=======================================================================
-# Recording and retrieving content details for later population
-#=======================================================================
-
-# Internal use, projects must not call this directly. It is
-# intended for use by FetchContent_Declare() only.
-#
-# Sets a content-specific global property (not meant for use
-# outside of functions defined here in this file) which can later
-# be retrieved using __FetchContent_getSavedDetails() with just the
-# same content name. If there is already a value stored in the
-# property, it is left unchanged and this call has no effect.
-# This allows parent projects to define the content details,
-# overriding anything a child project may try to set (properties
-# are not cached between runs, so the first thing to set it in a
-# build will be in control).
-function(__FetchContent_declareDetails contentName)
-
-  string(TOLOWER ${contentName} contentNameLower)
-  set(propertyName "_FetchContent_${contentNameLower}_savedDetails")
-  get_property(alreadyDefined GLOBAL PROPERTY ${propertyName} DEFINED)
-  if(NOT alreadyDefined)
-    define_property(GLOBAL PROPERTY ${propertyName}
-      BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()"
-      FULL_DOCS  "Details used by FetchContent_Populate() for ${contentName}"
-    )
-    set(__cmdArgs)
-    foreach(__item IN LISTS ARGN)
-      string(APPEND __cmdArgs " [==[${__item}]==]")
-    endforeach()
-    cmake_language(EVAL CODE
-      "set_property(GLOBAL PROPERTY ${propertyName} ${__cmdArgs})")
-  endif()
-
-endfunction()
-
-
-# Internal use, projects must not call this directly. It is
-# intended for use by the FetchContent_Declare() function.
-#
-# Retrieves details saved for the specified content in an
-# earlier call to __FetchContent_declareDetails().
-function(__FetchContent_getSavedDetails contentName outVar)
-
-  string(TOLOWER ${contentName} contentNameLower)
-  set(propertyName "_FetchContent_${contentNameLower}_savedDetails")
-  get_property(alreadyDefined GLOBAL PROPERTY ${propertyName} DEFINED)
-  if(NOT alreadyDefined)
-    message(FATAL_ERROR "No content details recorded for ${contentName}")
-  endif()
-  get_property(propertyValue GLOBAL PROPERTY ${propertyName})
-  set(${outVar} "${propertyValue}" PARENT_SCOPE)
-
-endfunction()
-
-
-# Saves population details of the content, sets defaults for the
-# SOURCE_DIR and BUILD_DIR.
-function(FetchContent_Declare contentName)
-
-  set(options "")
-  set(oneValueArgs SVN_REPOSITORY)
-  set(multiValueArgs "")
-
-  cmake_parse_arguments(PARSE_ARGV 1 ARG
-    "${options}" "${oneValueArgs}" "${multiValueArgs}")
-
-  unset(srcDirSuffix)
-  unset(svnRepoArgs)
-  if(ARG_SVN_REPOSITORY)
-    # Add a hash of the svn repository URL to the source dir. This works
-    # around the problem where if the URL changes, the download would
-    # fail because it tries to checkout/update rather than switch the
-    # old URL to the new one. We limit the hash to the first 7 characters
-    # so that the source path doesn't get overly long (which can be a
-    # problem on windows due to path length limits).
-    string(SHA1 urlSHA ${ARG_SVN_REPOSITORY})
-    string(SUBSTRING ${urlSHA} 0 7 urlSHA)
-    set(srcDirSuffix "-${urlSHA}")
-    set(svnRepoArgs  SVN_REPOSITORY ${ARG_SVN_REPOSITORY})
-  endif()
-
-  string(TOLOWER ${contentName} contentNameLower)
-
-  set(__argsQuoted)
-  foreach(__item IN LISTS ARG_UNPARSED_ARGUMENTS)
-    string(APPEND __argsQuoted " [==[${__item}]==]")
-  endforeach()
-  cmake_language(EVAL CODE "
-    __FetchContent_declareDetails(
-      ${contentNameLower}
-      SOURCE_DIR \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-src${srcDirSuffix}\"
-      BINARY_DIR \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build\"
-      \${svnRepoArgs}
-      # List these last so they can override things we set above
-      ${__argsQuoted}
-    )"
-  )
-
-endfunction()
-
-
-#=======================================================================
-# Set/get whether the specified content has been populated yet.
-# The setter also records the source and binary dirs used.
-#=======================================================================
-
-# Internal use, projects must not call this directly. It is
-# intended for use by the FetchContent_Populate() function to
-# record when FetchContent_Populate() is called for a particular
-# content name.
-function(__FetchContent_setPopulated contentName sourceDir binaryDir)
-
-  string(TOLOWER ${contentName} contentNameLower)
-  set(prefix "_FetchContent_${contentNameLower}")
-
-  set(propertyName "${prefix}_sourceDir")
-  define_property(GLOBAL PROPERTY ${propertyName}
-    BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()"
-    FULL_DOCS  "Details used by FetchContent_Populate() for ${contentName}"
-  )
-  set_property(GLOBAL PROPERTY ${propertyName} ${sourceDir})
-
-  set(propertyName "${prefix}_binaryDir")
-  define_property(GLOBAL PROPERTY ${propertyName}
-    BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()"
-    FULL_DOCS  "Details used by FetchContent_Populate() for ${contentName}"
-  )
-  set_property(GLOBAL PROPERTY ${propertyName} ${binaryDir})
-
-  set(propertyName "${prefix}_populated")
-  define_property(GLOBAL PROPERTY ${propertyName}
-    BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()"
-    FULL_DOCS  "Details used by FetchContent_Populate() for ${contentName}"
-  )
-  set_property(GLOBAL PROPERTY ${propertyName} True)
-
-endfunction()
-
-
-# Set variables in the calling scope for any of the retrievable
-# properties. If no specific properties are requested, variables
-# will be set for all retrievable properties.
-#
-# This function is intended to also be used by projects as the canonical
-# way to detect whether they should call FetchContent_Populate()
-# and pull the populated source into the build with add_subdirectory(),
-# if they are using the populated content in that way.
-function(FetchContent_GetProperties contentName)
-
-  string(TOLOWER ${contentName} contentNameLower)
-
-  set(options "")
-  set(oneValueArgs SOURCE_DIR BINARY_DIR POPULATED)
-  set(multiValueArgs "")
-
-  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  if(NOT ARG_SOURCE_DIR AND
-     NOT ARG_BINARY_DIR AND
-     NOT ARG_POPULATED)
-    # No specific properties requested, provide them all
-    set(ARG_SOURCE_DIR ${contentNameLower}_SOURCE_DIR)
-    set(ARG_BINARY_DIR ${contentNameLower}_BINARY_DIR)
-    set(ARG_POPULATED  ${contentNameLower}_POPULATED)
-  endif()
-
-  set(prefix "_FetchContent_${contentNameLower}")
-
-  if(ARG_SOURCE_DIR)
-    set(propertyName "${prefix}_sourceDir")
-    get_property(value GLOBAL PROPERTY ${propertyName})
-    if(value)
-      set(${ARG_SOURCE_DIR} ${value} PARENT_SCOPE)
-    endif()
-  endif()
-
-  if(ARG_BINARY_DIR)
-    set(propertyName "${prefix}_binaryDir")
-    get_property(value GLOBAL PROPERTY ${propertyName})
-    if(value)
-      set(${ARG_BINARY_DIR} ${value} PARENT_SCOPE)
-    endif()
-  endif()
-
-  if(ARG_POPULATED)
-    set(propertyName "${prefix}_populated")
-    get_property(value GLOBAL PROPERTY ${propertyName} DEFINED)
-    set(${ARG_POPULATED} ${value} PARENT_SCOPE)
-  endif()
-
-endfunction()
-
-
-#=======================================================================
-# Performing the population
-#=======================================================================
-
-# The value of contentName will always have been lowercased by the caller.
-# All other arguments are assumed to be options that are understood by
-# ExternalProject_Add(), except for QUIET and SUBBUILD_DIR.
-function(__FetchContent_directPopulate contentName)
-
-  set(options
-      QUIET
-  )
-  set(oneValueArgs
-      SUBBUILD_DIR
-      SOURCE_DIR
-      BINARY_DIR
-      # We need special processing if DOWNLOAD_NO_EXTRACT is true
-      DOWNLOAD_NO_EXTRACT
-      # Prevent the following from being passed through
-      CONFIGURE_COMMAND
-      BUILD_COMMAND
-      INSTALL_COMMAND
-      TEST_COMMAND
-      # We force both of these to be ON since we are always executing serially
-      # and we want all steps to have access to the terminal in case they
-      # need input from the command line (e.g. ask for a private key password)
-      # or they want to provide timely progress. We silently absorb and
-      # discard these if they are set by the caller.
-      USES_TERMINAL_DOWNLOAD
-      USES_TERMINAL_UPDATE
-  )
-  set(multiValueArgs "")
-
-  cmake_parse_arguments(PARSE_ARGV 1 ARG
-    "${options}" "${oneValueArgs}" "${multiValueArgs}")
-
-  if(NOT ARG_SUBBUILD_DIR)
-    message(FATAL_ERROR "Internal error: SUBBUILD_DIR not set")
-  elseif(NOT IS_ABSOLUTE "${ARG_SUBBUILD_DIR}")
-    set(ARG_SUBBUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${ARG_SUBBUILD_DIR}")
-  endif()
-
-  if(NOT ARG_SOURCE_DIR)
-    message(FATAL_ERROR "Internal error: SOURCE_DIR not set")
-  elseif(NOT IS_ABSOLUTE "${ARG_SOURCE_DIR}")
-    set(ARG_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/${ARG_SOURCE_DIR}")
-  endif()
-
-  if(NOT ARG_BINARY_DIR)
-    message(FATAL_ERROR "Internal error: BINARY_DIR not set")
-  elseif(NOT IS_ABSOLUTE "${ARG_BINARY_DIR}")
-    set(ARG_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/${ARG_BINARY_DIR}")
-  endif()
-
-  # Ensure the caller can know where to find the source and build directories
-  # with some convenient variables. Doing this here ensures the caller sees
-  # the correct result in the case where the default values are overridden by
-  # the content details set by the project.
-  set(${contentName}_SOURCE_DIR "${ARG_SOURCE_DIR}" PARENT_SCOPE)
-  set(${contentName}_BINARY_DIR "${ARG_BINARY_DIR}" PARENT_SCOPE)
-
-  # The unparsed arguments may contain spaces, so build up ARG_EXTRA
-  # in such a way that it correctly substitutes into the generated
-  # CMakeLists.txt file with each argument quoted.
-  unset(ARG_EXTRA)
-  foreach(arg IN LISTS ARG_UNPARSED_ARGUMENTS)
-    set(ARG_EXTRA "${ARG_EXTRA} \"${arg}\"")
-  endforeach()
-
-  if(ARG_DOWNLOAD_NO_EXTRACT)
-    set(ARG_EXTRA "${ARG_EXTRA} DOWNLOAD_NO_EXTRACT YES")
-    set(__FETCHCONTENT_COPY_FILE
-"
-ExternalProject_Get_Property(${contentName}-populate DOWNLOADED_FILE)
-get_filename_component(dlFileName \"\${DOWNLOADED_FILE}\" NAME)
-
-ExternalProject_Add_Step(${contentName}-populate copyfile
-  COMMAND    \"${CMAKE_COMMAND}\" -E copy_if_different
-             \"<DOWNLOADED_FILE>\" \"${ARG_SOURCE_DIR}\"
-  DEPENDEES  patch
-  DEPENDERS  configure
-  BYPRODUCTS \"${ARG_SOURCE_DIR}/\${dlFileName}\"
-  COMMENT    \"Copying file to SOURCE_DIR\"
-)
-")
-  else()
-    unset(__FETCHCONTENT_COPY_FILE)
-  endif()
-
-  # Hide output if requested, but save it to a variable in case there's an
-  # error so we can show the output upon failure. When not quiet, don't
-  # capture the output to a variable because the user may want to see the
-  # output as it happens (e.g. progress during long downloads). Combine both
-  # stdout and stderr in the one capture variable so the output stays in order.
-  if (ARG_QUIET)
-    set(outputOptions
-        OUTPUT_VARIABLE capturedOutput
-        ERROR_VARIABLE  capturedOutput
-    )
-  else()
-    set(capturedOutput)
-    set(outputOptions)
-    message(STATUS "Populating ${contentName}")
-  endif()
-
-  if(CMAKE_GENERATOR)
-    set(subCMakeOpts "-G${CMAKE_GENERATOR}")
-    if(CMAKE_GENERATOR_PLATFORM)
-      list(APPEND subCMakeOpts "-A${CMAKE_GENERATOR_PLATFORM}")
-    endif()
-    if(CMAKE_GENERATOR_TOOLSET)
-      list(APPEND subCMakeOpts "-T${CMAKE_GENERATOR_TOOLSET}")
-    endif()
-
-    if(CMAKE_MAKE_PROGRAM)
-      list(APPEND subCMakeOpts "-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}")
-    endif()
-
-  else()
-    # Likely we've been invoked via CMake's script mode where no
-    # generator is set (and hence CMAKE_MAKE_PROGRAM could not be
-    # trusted even if provided). We will have to rely on being
-    # able to find the default generator and build tool.
-    unset(subCMakeOpts)
-  endif()
-
-  if(DEFINED CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY)
-    list(APPEND subCMakeOpts
-      "-DCMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY=${CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY}")
-  endif()
-
-  # Avoid using if(... IN_LIST ...) so we don't have to alter policy settings
-  set(__FETCHCONTENT_CACHED_INFO "")
-  list(FIND ARG_UNPARSED_ARGUMENTS GIT_REPOSITORY indexResult)
-  if(indexResult GREATER_EQUAL 0)
-    find_package(Git QUIET)
-    set(__FETCHCONTENT_CACHED_INFO
-"# Pass through things we've already detected in the main project to avoid
-# paying the cost of redetecting them again in ExternalProject_Add()
-set(GIT_EXECUTABLE [==[${GIT_EXECUTABLE}]==])
-set(GIT_VERSION_STRING [==[${GIT_VERSION_STRING}]==])
-set_property(GLOBAL PROPERTY _CMAKE_FindGit_GIT_EXECUTABLE_VERSION
-  [==[${GIT_EXECUTABLE};${GIT_VERSION_STRING}]==]
-)
-")
-  endif()
-
-  # Create and build a separate CMake project to carry out the population.
-  # If we've already previously done these steps, they will not cause
-  # anything to be updated, so extra rebuilds of the project won't occur.
-  # Make sure to pass through CMAKE_MAKE_PROGRAM in case the main project
-  # has this set to something not findable on the PATH.
-  configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/FetchContent/CMakeLists.cmake.in"
-                 "${ARG_SUBBUILD_DIR}/CMakeLists.txt")
-  execute_process(
-    COMMAND ${CMAKE_COMMAND} ${subCMakeOpts} .
-    RESULT_VARIABLE result
-    ${outputOptions}
-    WORKING_DIRECTORY "${ARG_SUBBUILD_DIR}"
-  )
-  if(result)
-    if(capturedOutput)
-      message("${capturedOutput}")
-    endif()
-    message(FATAL_ERROR "CMake step for ${contentName} failed: ${result}")
-  endif()
-  execute_process(
-    COMMAND ${CMAKE_COMMAND} --build .
-    RESULT_VARIABLE result
-    ${outputOptions}
-    WORKING_DIRECTORY "${ARG_SUBBUILD_DIR}"
-  )
-  if(result)
-    if(capturedOutput)
-      message("${capturedOutput}")
-    endif()
-    message(FATAL_ERROR "Build step for ${contentName} failed: ${result}")
-  endif()
-
-endfunction()
-
-
-option(FETCHCONTENT_FULLY_DISCONNECTED   "Disables all attempts to download or update content and assumes source dirs already exist")
-option(FETCHCONTENT_UPDATES_DISCONNECTED "Enables UPDATE_DISCONNECTED behavior for all content population")
-option(FETCHCONTENT_QUIET                "Enables QUIET option for all content population" ON)
-set(FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/_deps" CACHE PATH "Directory under which to collect all populated content")
-
-# Populate the specified content using details stored from
-# an earlier call to FetchContent_Declare().
-function(FetchContent_Populate contentName)
-
-  if(NOT contentName)
-    message(FATAL_ERROR "Empty contentName not allowed for FetchContent_Populate()")
-  endif()
-
-  string(TOLOWER ${contentName} contentNameLower)
-
-  if(ARGN)
-    # This is the direct population form with details fully specified
-    # as part of the call, so we already have everything we need
-    __FetchContent_directPopulate(
-      ${contentNameLower}
-      SUBBUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${contentNameLower}-subbuild"
-      SOURCE_DIR   "${CMAKE_CURRENT_BINARY_DIR}/${contentNameLower}-src"
-      BINARY_DIR   "${CMAKE_CURRENT_BINARY_DIR}/${contentNameLower}-build"
-      ${ARGN}  # Could override any of the above ..._DIR variables
-    )
-
-    # Pass source and binary dir variables back to the caller
-    set(${contentNameLower}_SOURCE_DIR "${${contentNameLower}_SOURCE_DIR}" PARENT_SCOPE)
-    set(${contentNameLower}_BINARY_DIR "${${contentNameLower}_BINARY_DIR}" PARENT_SCOPE)
-
-    # Don't set global properties, or record that we did this population, since
-    # this was a direct call outside of the normal declared details form.
-    # We only want to save values in the global properties for content that
-    # honors the hierarchical details mechanism so that projects are not
-    # robbed of the ability to override details set in nested projects.
-    return()
-  endif()
-
-  # No details provided, so assume they were saved from an earlier call
-  # to FetchContent_Declare(). Do a check that we haven't already
-  # populated this content before in case the caller forgot to check.
-  FetchContent_GetProperties(${contentName})
-  if(${contentNameLower}_POPULATED)
-    message(FATAL_ERROR "Content ${contentName} already populated in ${${contentNameLower}_SOURCE_DIR}")
-  endif()
-
-  __FetchContent_getSavedDetails(${contentName} contentDetails)
-  if("${contentDetails}" STREQUAL "")
-    message(FATAL_ERROR "No details have been set for content: ${contentName}")
-  endif()
-
-  string(TOUPPER ${contentName} contentNameUpper)
-  set(FETCHCONTENT_SOURCE_DIR_${contentNameUpper}
-      "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}"
-      CACHE PATH "When not empty, overrides where to find pre-populated content for ${contentName}")
-
-  if(FETCHCONTENT_SOURCE_DIR_${contentNameUpper})
-    # The source directory has been explicitly provided in the cache,
-    # so no population is required. The build directory may still be specified
-    # by the declared details though.
-
-    if(NOT IS_ABSOLUTE "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
-      # Don't check this directory because we don't know what location it is
-      # expected to be relative to. We can't make this a hard error for backward
-      # compatibility reasons.
-      message(WARNING "Relative source directory specified. This is not safe, "
-        "as it depends on the calling directory scope.\n"
-        "  FETCHCONTENT_SOURCE_DIR_${contentNameUpper} --> ${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
-    elseif(NOT EXISTS "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
-      message(FATAL_ERROR "Manually specified source directory is missing:\n"
-        "  FETCHCONTENT_SOURCE_DIR_${contentNameUpper} --> ${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
-    endif()
-
-    set(${contentNameLower}_SOURCE_DIR "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
-
-    cmake_parse_arguments(savedDetails "" "BINARY_DIR" "" ${contentDetails})
-
-    if(savedDetails_BINARY_DIR)
-      set(${contentNameLower}_BINARY_DIR ${savedDetails_BINARY_DIR})
-    else()
-      set(${contentNameLower}_BINARY_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build")
-    endif()
-
-  elseif(FETCHCONTENT_FULLY_DISCONNECTED)
-    # Bypass population and assume source is already there from a previous run.
-    # Declared details may override the default source or build directories.
-
-    cmake_parse_arguments(savedDetails "" "SOURCE_DIR;BINARY_DIR" "" ${contentDetails})
-
-    if(savedDetails_SOURCE_DIR)
-      set(${contentNameLower}_SOURCE_DIR ${savedDetails_SOURCE_DIR})
-    else()
-      set(${contentNameLower}_SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-src")
-    endif()
-
-    if(savedDetails_BINARY_DIR)
-      set(${contentNameLower}_BINARY_DIR ${savedDetails_BINARY_DIR})
-    else()
-      set(${contentNameLower}_BINARY_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build")
-    endif()
-
-  else()
-    # Support both a global "disconnect all updates" and a per-content
-    # update test (either one being set disables updates for this content).
-    option(FETCHCONTENT_UPDATES_DISCONNECTED_${contentNameUpper}
-           "Enables UPDATE_DISCONNECTED behavior just for population of ${contentName}")
-    if(FETCHCONTENT_UPDATES_DISCONNECTED OR
-       FETCHCONTENT_UPDATES_DISCONNECTED_${contentNameUpper})
-      set(disconnectUpdates True)
-    else()
-      set(disconnectUpdates False)
-    endif()
-
-    if(FETCHCONTENT_QUIET)
-      set(quietFlag QUIET)
-    else()
-      unset(quietFlag)
-    endif()
-
-    set(__detailsQuoted)
-    foreach(__item IN LISTS contentDetails)
-      string(APPEND __detailsQuoted " [==[${__item}]==]")
-    endforeach()
-    cmake_language(EVAL CODE "
-      __FetchContent_directPopulate(
-        ${contentNameLower}
-        ${quietFlag}
-        UPDATE_DISCONNECTED ${disconnectUpdates}
-        SUBBUILD_DIR \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-subbuild\"
-        SOURCE_DIR   \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-src\"
-        BINARY_DIR   \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build\"
-        # Put the saved details last so they can override any of the
-        # the options we set above (this can include SOURCE_DIR or
-        # BUILD_DIR)
-        ${__detailsQuoted}
-      )"
-    )
-  endif()
-
-  __FetchContent_setPopulated(
-    ${contentName}
-    ${${contentNameLower}_SOURCE_DIR}
-    ${${contentNameLower}_BINARY_DIR}
-  )
-
-  # Pass variables back to the caller. The variables passed back here
-  # must match what FetchContent_GetProperties() sets when it is called
-  # with just the content name.
-  set(${contentNameLower}_SOURCE_DIR "${${contentNameLower}_SOURCE_DIR}" PARENT_SCOPE)
-  set(${contentNameLower}_BINARY_DIR "${${contentNameLower}_BINARY_DIR}" PARENT_SCOPE)
-  set(${contentNameLower}_POPULATED  True PARENT_SCOPE)
-
-endfunction()
-
-# Arguments are assumed to be the names of dependencies that have been
-# declared previously and should be populated. It is not an error if
-# any of them have already been populated (they will just be skipped in
-# that case). The command is implemented as a macro so that the variables
-# defined by the FetchContent_GetProperties() and FetchContent_Populate()
-# calls will be available to the caller.
-macro(FetchContent_MakeAvailable)
-
-  foreach(__cmake_contentName IN ITEMS ${ARGV})
-    string(TOLOWER ${__cmake_contentName} __cmake_contentNameLower)
-    FetchContent_GetProperties(${__cmake_contentName})
-    if(NOT ${__cmake_contentNameLower}_POPULATED)
-      FetchContent_Populate(${__cmake_contentName})
-
-      # Only try to call add_subdirectory() if the populated content
-      # can be treated that way. Protecting the call with the check
-      # allows this function to be used for projects that just want
-      # to ensure the content exists, such as to provide content at
-      # a known location. We check the saved details for an optional
-      # SOURCE_SUBDIR which can be used in the same way as its meaning
-      # for ExternalProject. It won't matter if it was passed through
-      # to the ExternalProject sub-build, since it would have been
-      # ignored there.
-      set(__cmake_srcdir "${${__cmake_contentNameLower}_SOURCE_DIR}")
-      __FetchContent_getSavedDetails(${__cmake_contentName} __cmake_contentDetails)
-      if("${__cmake_contentDetails}" STREQUAL "")
-        message(FATAL_ERROR "No details have been set for content: ${__cmake_contentName}")
-      endif()
-      cmake_parse_arguments(__cmake_arg "" "SOURCE_SUBDIR" "" ${__cmake_contentDetails})
-      if(NOT "${__cmake_arg_SOURCE_SUBDIR}" STREQUAL "")
-        string(APPEND __cmake_srcdir "/${__cmake_arg_SOURCE_SUBDIR}")
-      endif()
-
-      if(EXISTS ${__cmake_srcdir}/CMakeLists.txt)
-        add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR})
-      endif()
-
-      unset(__cmake_srcdir)
-    endif()
-  endforeach()
-
-  # clear local variables to prevent leaking into the caller's scope
-  unset(__cmake_contentName)
-  unset(__cmake_contentNameLower)
-  unset(__cmake_contentDetails)
-  unset(__cmake_arg_SOURCE_SUBDIR)
-
-endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGLUT.cmake b/deps/cmake/share/cmake-3.21/Modules/FindGLUT.cmake
deleted file mode 100644
index 2770c604..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/FindGLUT.cmake
+++ /dev/null
@@ -1,206 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindGLUT
---------
-
-Find OpenGL Utility Toolkit (GLUT) library and include files.
-
-IMPORTED Targets
-^^^^^^^^^^^^^^^^
-
-.. versionadded:: 3.1
-
-This module defines the :prop_tgt:`IMPORTED` targets:
-
-``GLUT::GLUT``
- Defined if the system has GLUT.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module sets the following variables:
-
-::
-
-  GLUT_INCLUDE_DIR, where to find GL/glut.h, etc.
-  GLUT_LIBRARIES, the libraries to link against
-  GLUT_FOUND, If false, do not try to use GLUT.
-
-Also defined, but not for general use are:
-
-::
-
-  GLUT_glut_LIBRARY = the full path to the glut library.
-  GLUT_Xmu_LIBRARY  = the full path to the Xmu library.
-  GLUT_Xi_LIBRARY   = the full path to the Xi Library.
-
-.. versionadded:: 3.13
-  Debug and Release variants are found separately.
-#]=======================================================================]
-
-include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
-
-if (WIN32)
-  find_path( GLUT_INCLUDE_DIR NAMES GL/glut.h
-    PATHS  ${GLUT_ROOT_PATH}/include )
-  find_library( GLUT_glut_LIBRARY_RELEASE NAMES glut glut32 freeglut
-    PATHS
-    ${OPENGL_LIBRARY_DIR}
-    ${GLUT_ROOT_PATH}/Release
-    )
-  find_library( GLUT_glut_LIBRARY_DEBUG NAMES freeglutd
-    PATHS
-    ${OPENGL_LIBRARY_DIR}
-    ${GLUT_ROOT_PATH}/Debug
-    )
-  mark_as_advanced(GLUT_glut_LIBRARY_RELEASE GLUT_glut_LIBRARY_DEBUG)
-  select_library_configurations(GLUT_glut)
-else ()
-
-  if (APPLE)
-    find_path(GLUT_INCLUDE_DIR glut.h ${OPENGL_LIBRARY_DIR})
-    find_library(GLUT_glut_LIBRARY GLUT DOC "GLUT library for OSX")
-    find_library(GLUT_cocoa_LIBRARY Cocoa DOC "Cocoa framework for OSX")
-    mark_as_advanced(GLUT_glut_LIBRARY GLUT_cocoa_LIBRARY)
-
-    if(GLUT_cocoa_LIBRARY AND NOT TARGET GLUT::Cocoa)
-      add_library(GLUT::Cocoa UNKNOWN IMPORTED)
-      # Cocoa should always be a Framework, but we check to make sure.
-      if(GLUT_cocoa_LIBRARY MATCHES "/([^/]+)\\.framework$")
-        set(_glut_cocoa "${GLUT_cocoa_LIBRARY}/${CMAKE_MATCH_1}")
-        if(EXISTS "${_glut_cocoa}.tbd")
-          string(APPEND _glut_cocoa ".tbd")
-        endif()
-        set_target_properties(GLUT::Cocoa PROPERTIES
-          IMPORTED_LOCATION "${_glut_cocoa}")
-      else()
-        set_target_properties(GLUT::Cocoa PROPERTIES
-          IMPORTED_LOCATION "${GLUT_cocoa_LIBRARY}")
-      endif()
-    endif()
-  else ()
-
-    if (BEOS)
-
-      set(_GLUT_INC_DIR /boot/develop/headers/os/opengl)
-      set(_GLUT_glut_LIB_DIR /boot/develop/lib/x86)
-
-    else()
-
-      find_library( GLUT_Xi_LIBRARY Xi
-        /usr/openwin/lib
-        )
-      mark_as_advanced(GLUT_Xi_LIBRARY)
-
-      find_library( GLUT_Xmu_LIBRARY Xmu
-        /usr/openwin/lib
-        )
-      mark_as_advanced(GLUT_Xmu_LIBRARY)
-
-      if(GLUT_Xi_LIBRARY AND NOT TARGET GLUT::Xi)
-        add_library(GLUT::Xi UNKNOWN IMPORTED)
-        set_target_properties(GLUT::Xi PROPERTIES
-          IMPORTED_LOCATION "${GLUT_Xi_LIBRARY}")
-      endif()
-
-      if(GLUT_Xmu_LIBRARY AND NOT TARGET GLUT::Xmu)
-        add_library(GLUT::Xmu UNKNOWN IMPORTED)
-        set_target_properties(GLUT::Xmu PROPERTIES
-          IMPORTED_LOCATION "${GLUT_Xmu_LIBRARY}")
-      endif()
-
-    endif ()
-
-    find_path( GLUT_INCLUDE_DIR GL/glut.h
-      /usr/include/GL
-      /usr/openwin/share/include
-      /usr/openwin/include
-      /opt/graphics/OpenGL/include
-      /opt/graphics/OpenGL/contrib/libglut
-      ${_GLUT_INC_DIR}
-      )
-
-    find_library( GLUT_glut_LIBRARY glut
-      /usr/openwin/lib
-      ${_GLUT_glut_LIB_DIR}
-      )
-    mark_as_advanced(GLUT_glut_LIBRARY)
-
-    unset(_GLUT_INC_DIR)
-    unset(_GLUT_glut_LIB_DIR)
-
-  endif ()
-
-endif ()
-
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR)
-
-if (GLUT_FOUND)
-  # Is -lXi and -lXmu required on all platforms that have it?
-  # If not, we need some way to figure out what platform we are on.
-  set( GLUT_LIBRARIES
-    ${GLUT_glut_LIBRARY}
-    )
-  foreach(v GLUT_Xmu_LIBRARY GLUT_Xi_LIBRARY GLUT_cocoa_LIBRARY)
-    if(${v})
-      list(APPEND GLUT_LIBRARIES ${${v}})
-    endif()
-  endforeach()
-
-  if(NOT TARGET GLUT::GLUT)
-    add_library(GLUT::GLUT UNKNOWN IMPORTED)
-    set_target_properties(GLUT::GLUT PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${GLUT_INCLUDE_DIR}")
-    if(GLUT_glut_LIBRARY MATCHES "/([^/]+)\\.framework$")
-      set(_glut_glut "${GLUT_glut_LIBRARY}/${CMAKE_MATCH_1}")
-      if(EXISTS "${_glut_glut}.tbd")
-        string(APPEND _glut_glut ".tbd")
-      endif()
-      set_target_properties(GLUT::GLUT PROPERTIES
-        IMPORTED_LOCATION "${_glut_glut}")
-    else()
-      if(GLUT_glut_LIBRARY_RELEASE)
-        set_property(TARGET GLUT::GLUT APPEND PROPERTY
-          IMPORTED_CONFIGURATIONS RELEASE)
-        set_target_properties(GLUT::GLUT PROPERTIES
-          IMPORTED_LOCATION_RELEASE "${GLUT_glut_LIBRARY_RELEASE}")
-      endif()
-
-      if(GLUT_glut_LIBRARY_DEBUG)
-        set_property(TARGET GLUT::GLUT APPEND PROPERTY
-          IMPORTED_CONFIGURATIONS DEBUG)
-        set_target_properties(GLUT::GLUT PROPERTIES
-          IMPORTED_LOCATION_DEBUG "${GLUT_glut_LIBRARY_DEBUG}")
-      endif()
-
-      if(NOT GLUT_glut_LIBRARY_RELEASE AND NOT GLUT_glut_LIBRARY_DEBUG)
-        set_property(TARGET GLUT::GLUT APPEND PROPERTY
-          IMPORTED_LOCATION "${GLUT_glut_LIBRARY}")
-      endif()
-    endif()
-
-    if(TARGET GLUT::Xmu)
-      set_property(TARGET GLUT::GLUT APPEND
-        PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Xmu)
-    endif()
-
-    if(TARGET GLUT::Xi)
-      set_property(TARGET GLUT::GLUT APPEND
-        PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Xi)
-    endif()
-
-    if(TARGET GLUT::Cocoa)
-      set_property(TARGET GLUT::GLUT APPEND
-        PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Cocoa)
-    endif()
-  endif()
-
-  #The following deprecated settings are for backwards compatibility with CMake1.4
-  set (GLUT_LIBRARY ${GLUT_LIBRARIES})
-  set (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
-endif()
-
-mark_as_advanced(GLUT_INCLUDE_DIR)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindJNI.cmake b/deps/cmake/share/cmake-3.21/Modules/FindJNI.cmake
deleted file mode 100644
index e4f60b31..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/FindJNI.cmake
+++ /dev/null
@@ -1,405 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindJNI
--------
-
-Find Java Native Interface (JNI) libraries.
-
-JNI enables Java code running in a Java Virtual Machine (JVM) to call
-and be called by native applications and libraries written in other
-languages such as C, C++.
-
-This module finds if Java is installed and determines where the
-include files and libraries are.  It also determines what the name of
-the library is.  The caller may set variable ``JAVA_HOME`` to specify a
-Java installation prefix explicitly.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module sets the following result variables:
-
-``JNI_INCLUDE_DIRS``
-  the include dirs to use
-``JNI_LIBRARIES``
-  the libraries to use (JAWT and JVM)
-``JNI_FOUND``
-  TRUE if JNI headers and libraries were found.
-
-Cache Variables
-^^^^^^^^^^^^^^^
-
-The following cache variables are also available to set or use:
-
-``JAVA_AWT_LIBRARY``
-  the path to the Java AWT Native Interface (JAWT) library
-``JAVA_JVM_LIBRARY``
-  the path to the Java Virtual Machine (JVM) library
-``JAVA_INCLUDE_PATH``
-  the include path to jni.h
-``JAVA_INCLUDE_PATH2``
-  the include path to jni_md.h and jniport.h
-``JAVA_AWT_INCLUDE_PATH``
-  the include path to jawt.h
-#]=======================================================================]
-
-# Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
-macro(java_append_library_directories _var)
-    # Determine java arch-specific library subdir
-    # Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
-    # 1.6.0_18 + icedtea patches. However, it would be much better to base the
-    # guess on the first part of the GNU config.guess platform triplet.
-    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
-        set(_java_libarch "x32" "amd64" "i386")
-      else()
-        set(_java_libarch "amd64" "i386")
-      endif()
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
-        set(_java_libarch "i386")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
-        set(_java_libarch "arm64" "aarch64")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
-        set(_java_libarch "alpha")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-        # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
-        set(_java_libarch "arm" "aarch32")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-        # mips* machines are bi-endian mostly so processor does not tell
-        # endianness of the underlying system.
-        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}"
-            "mips" "mipsel" "mipseb" "mipsr6" "mipsr6el"
-            "mips64" "mips64el" "mips64r6" "mips64r6el"
-            "mipsn32" "mipsn32el" "mipsn32r6" "mipsn32r6el")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
-        set(_java_libarch "ppc64" "ppc64le")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
-        set(_java_libarch "ppc64" "ppc")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-        set(_java_libarch "ppc" "ppc64")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
-        # Both flavors can run on the same processor
-        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
-        set(_java_libarch "parisc" "parisc64")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
-        # s390 binaries can run on s390x machines
-        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
-        set(_java_libarch "sh")
-    else()
-        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}")
-    endif()
-
-    # Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
-    # system is non-Linux (where the code above has not been well tested)
-    if(NOT _java_libarch OR NOT (CMAKE_SYSTEM_NAME MATCHES "Linux"))
-        list(APPEND _java_libarch "i386" "amd64" "ppc")
-    endif()
-
-    # Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-    # current value to a hardcoded list. Remove possible duplicates.
-    list(REMOVE_DUPLICATES _java_libarch)
-
-    foreach(_path ${ARGN})
-        if(_path MATCHES "{libarch}")
-            foreach(_libarch ${_java_libarch})
-                string(REPLACE "{libarch}" "${_libarch}" _newpath "${_path}")
-                if(EXISTS ${_newpath})
-                    list(APPEND ${_var} "${_newpath}")
-                endif()
-            endforeach()
-        else()
-            if(EXISTS ${_path})
-                list(APPEND ${_var} "${_path}")
-            endif()
-        endif()
-    endforeach()
-endmacro()
-
-include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
-
-# Save CMAKE_FIND_FRAMEWORK
-if(DEFINED CMAKE_FIND_FRAMEWORK)
-  set(_JNI_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
-else()
-  unset(_JNI_CMAKE_FIND_FRAMEWORK)
-endif()
-
-if(_JAVA_HOME_EXPLICIT)
-  set(CMAKE_FIND_FRAMEWORK NEVER)
-endif()
-
-set(JAVA_AWT_LIBRARY_DIRECTORIES)
-if(_JAVA_HOME)
-  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-    ${_JAVA_HOME}/jre/lib/{libarch}
-    ${_JAVA_HOME}/jre/lib
-    ${_JAVA_HOME}/lib/{libarch}
-    ${_JAVA_HOME}/lib
-    ${_JAVA_HOME}
-    )
-endif()
-
-if (WIN32)
-  set (_JNI_HINTS)
-  execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK
-    RESULT_VARIABLE _JNI_RESULT
-    OUTPUT_VARIABLE _JNI_VERSIONS
-    ERROR_QUIET)
-  if (NOT  _JNI_RESULT)
-    string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\JDK\\\\[0-9.]+" _JNI_VERSIONS "${_JNI_VERSIONS}")
-    if (_JNI_VERSIONS)
-      # sort versions. Most recent first
-      ## handle version 9 apart from other versions to get correct ordering
-      set (_JNI_V9 ${_JNI_VERSIONS})
-      list (FILTER _JNI_VERSIONS EXCLUDE REGEX "JDK\\\\9")
-      list (SORT _JNI_VERSIONS)
-      list (REVERSE _JNI_VERSIONS)
-      list (FILTER _JNI_V9 INCLUDE REGEX "JDK\\\\9")
-      list (SORT _JNI_V9)
-      list (REVERSE _JNI_V9)
-      list (APPEND _JNI_VERSIONS ${_JNI_V9})
-      foreach (_JNI_HINT IN LISTS _JNI_VERSIONS)
-        list(APPEND _JNI_HINTS "[${_JNI_HINT};JavaHome]")
-      endforeach()
-    endif()
-  endif()
-
-  foreach (_JNI_HINT IN LISTS _JNI_HINTS)
-    list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES "${_JNI_HINT}/lib")
-  endforeach()
-
-  get_filename_component(java_install_version
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
-
-  list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-    )
-endif()
-
-set(_JNI_JAVA_DIRECTORIES_BASE
-  /usr/lib/jvm/java
-  /usr/lib/java
-  /usr/lib/jvm
-  /usr/local/lib/java
-  /usr/local/share/java
-  /usr/lib/j2sdk1.4-sun
-  /usr/lib/j2sdk1.5-sun
-  /opt/sun-jdk-1.5.0.04
-  /usr/lib/jvm/java-6-sun
-  /usr/lib/jvm/java-1.5.0-sun
-  /usr/lib/jvm/java-6-sun-1.6.0.00       # can this one be removed according to #8821 ? Alex
-  /usr/lib/jvm/java-6-openjdk
-  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0        # fedora
-  # Debian specific paths for default JVM
-  /usr/lib/jvm/default-java
-  # Arch Linux specific paths for default JVM
-  /usr/lib/jvm/default
-  # Ubuntu specific paths for default JVM
-  /usr/lib/jvm/java-11-openjdk-{libarch}    # Ubuntu 18.04 LTS
-  /usr/lib/jvm/java-8-openjdk-{libarch}     # Ubuntu 15.10
-  /usr/lib/jvm/java-7-openjdk-{libarch}     # Ubuntu 15.10
-  /usr/lib/jvm/java-6-openjdk-{libarch}     # Ubuntu 15.10
-  # OpenBSD specific paths for default JVM
-  /usr/local/jdk-1.7.0
-  /usr/local/jre-1.7.0
-  /usr/local/jdk-1.6.0
-  /usr/local/jre-1.6.0
-  # FreeBSD specific paths for default JVM
-  /usr/local/openjdk15
-  /usr/local/openjdk14
-  /usr/local/openjdk13
-  /usr/local/openjdk12
-  /usr/local/openjdk11
-  /usr/local/openjdk8
-  /usr/local/openjdk7
-  # SuSE specific paths for default JVM
-  /usr/lib64/jvm/java
-  /usr/lib64/jvm/jre
-  )
-
-set(_JNI_JAVA_AWT_LIBRARY_TRIES)
-set(_JNI_JAVA_INCLUDE_TRIES)
-
-foreach(_java_dir IN LISTS _JNI_JAVA_DIRECTORIES_BASE)
-  list(APPEND _JNI_JAVA_AWT_LIBRARY_TRIES
-    ${_java_dir}/jre/lib/{libarch}
-    ${_java_dir}/jre/lib
-    ${_java_dir}/lib/{libarch}
-    ${_java_dir}/lib
-    ${_java_dir}
-  )
-  list(APPEND _JNI_JAVA_INCLUDE_TRIES
-    ${_java_dir}/include
-  )
-endforeach()
-
-JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-    ${_JNI_JAVA_AWT_LIBRARY_TRIES}
-  )
-
-set(JAVA_JVM_LIBRARY_DIRECTORIES)
-foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-  list(APPEND JAVA_JVM_LIBRARY_DIRECTORIES
-    "${dir}"
-    "${dir}/client"
-    "${dir}/server"
-    # IBM SDK, Java Technology Edition, specific paths
-    "${dir}/j9vm"
-    "${dir}/default"
-    )
-endforeach()
-
-set(JAVA_AWT_INCLUDE_DIRECTORIES)
-if(_JAVA_HOME)
-  list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
-endif()
-if (WIN32)
-  foreach (_JNI_HINT IN LISTS _JNI_HINTS)
-    list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "${_JNI_HINT}/include")
-  endforeach()
-  list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
-    )
-endif()
-
-JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-  ${_JNI_JAVA_INCLUDE_TRIES}
-  )
-
-foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
-  get_filename_component(jpath "${JAVA_PROG}" PATH)
-  foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)
-    if(EXISTS ${jpath}/${JAVA_INC_PATH})
-      list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "${jpath}/${JAVA_INC_PATH}")
-    endif()
-  endforeach()
-  foreach(JAVA_LIB_PATH
-    ../lib ../jre/lib ../jre/lib/i386
-    ../java/lib ../java/jre/lib ../java/jre/lib/i386
-    ../share/java/lib ../share/java/jre/lib ../share/java/jre/lib/i386)
-    if(EXISTS ${jpath}/${JAVA_LIB_PATH})
-      list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES "${jpath}/${JAVA_LIB_PATH}")
-    endif()
-  endforeach()
-endforeach()
-
-if(APPLE)
-  if(CMAKE_FIND_FRAMEWORK STREQUAL "ONLY")
-    set(_JNI_SEARCHES FRAMEWORK)
-  elseif(CMAKE_FIND_FRAMEWORK STREQUAL "NEVER")
-    set(_JNI_SEARCHES NORMAL)
-  elseif(CMAKE_FIND_FRAMEWORK STREQUAL "LAST")
-    set(_JNI_SEARCHES NORMAL FRAMEWORK)
-  else()
-    set(_JNI_SEARCHES FRAMEWORK NORMAL)
-  endif()
-  set(_JNI_FRAMEWORK_JVM NAMES JavaVM)
-  set(_JNI_FRAMEWORK_JAWT "${_JNI_FRAMEWORK_JVM}")
-else()
-  set(_JNI_SEARCHES NORMAL)
-endif()
-
-set(_JNI_NORMAL_JVM
-  NAMES jvm
-  PATHS ${JAVA_JVM_LIBRARY_DIRECTORIES}
-  )
-
-set(_JNI_NORMAL_JAWT
-  NAMES jawt
-  PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
-  )
-
-foreach(search ${_JNI_SEARCHES})
-  find_library(JAVA_JVM_LIBRARY ${_JNI_${search}_JVM})
-  find_library(JAVA_AWT_LIBRARY ${_JNI_${search}_JAWT})
-  if(JAVA_JVM_LIBRARY)
-    break()
-  endif()
-endforeach()
-unset(_JNI_SEARCHES)
-unset(_JNI_FRAMEWORK_JVM)
-unset(_JNI_FRAMEWORK_JAWT)
-unset(_JNI_NORMAL_JVM)
-unset(_JNI_NORMAL_JAWT)
-
-# Find headers matching the library.
-if("${JAVA_JVM_LIBRARY};${JAVA_AWT_LIBRARY};" MATCHES "(/JavaVM.framework|-framework JavaVM);")
-  set(CMAKE_FIND_FRAMEWORK ONLY)
-else()
-  set(CMAKE_FIND_FRAMEWORK NEVER)
-endif()
-
-# add in the include path
-find_path(JAVA_INCLUDE_PATH jni.h
-  ${JAVA_AWT_INCLUDE_DIRECTORIES}
-)
-
-find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h
-  PATHS
-  ${JAVA_INCLUDE_PATH}
-  ${JAVA_INCLUDE_PATH}/darwin
-  ${JAVA_INCLUDE_PATH}/win32
-  ${JAVA_INCLUDE_PATH}/linux
-  ${JAVA_INCLUDE_PATH}/freebsd
-  ${JAVA_INCLUDE_PATH}/openbsd
-  ${JAVA_INCLUDE_PATH}/solaris
-  ${JAVA_INCLUDE_PATH}/hp-ux
-  ${JAVA_INCLUDE_PATH}/alpha
-  ${JAVA_INCLUDE_PATH}/aix
-)
-
-find_path(JAVA_AWT_INCLUDE_PATH jawt.h
-  ${JAVA_INCLUDE_PATH}
-)
-
-# Restore CMAKE_FIND_FRAMEWORK
-if(DEFINED _JNI_CMAKE_FIND_FRAMEWORK)
-  set(CMAKE_FIND_FRAMEWORK ${_JNI_CMAKE_FIND_FRAMEWORK})
-  unset(_JNI_CMAKE_FIND_FRAMEWORK)
-else()
-  unset(CMAKE_FIND_FRAMEWORK)
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI  DEFAULT_MSG  JAVA_AWT_LIBRARY
-                                                    JAVA_JVM_LIBRARY
-                                                    JAVA_INCLUDE_PATH
-                                                    JAVA_INCLUDE_PATH2
-                                                    JAVA_AWT_INCLUDE_PATH)
-
-mark_as_advanced(
-  JAVA_AWT_LIBRARY
-  JAVA_JVM_LIBRARY
-  JAVA_AWT_INCLUDE_PATH
-  JAVA_INCLUDE_PATH
-  JAVA_INCLUDE_PATH2
-)
-
-set(JNI_LIBRARIES
-  ${JAVA_AWT_LIBRARY}
-  ${JAVA_JVM_LIBRARY}
-)
-
-set(JNI_INCLUDE_DIRS
-  ${JAVA_INCLUDE_PATH}
-  ${JAVA_INCLUDE_PATH2}
-  ${JAVA_AWT_INCLUDE_PATH}
-)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindJasper.cmake b/deps/cmake/share/cmake-3.21/Modules/FindJasper.cmake
deleted file mode 100644
index 729a5035..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/FindJasper.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindJasper
-----------
-
-Try to find the Jasper JPEG2000 library
-
-Once done this will define
-
-::
-
-  JASPER_FOUND - system has Jasper
-  JASPER_INCLUDE_DIR - the Jasper include directory
-  JASPER_LIBRARIES - the libraries needed to use Jasper
-  JASPER_VERSION_STRING - the version of Jasper found (since CMake 2.8.8)
-#]=======================================================================]
-
-find_path(JASPER_INCLUDE_DIR jasper/jasper.h)
-
-if (NOT JASPER_LIBRARIES)
-    find_package(JPEG)
-
-    find_library(JASPER_LIBRARY_RELEASE NAMES jasper libjasper)
-    find_library(JASPER_LIBRARY_DEBUG NAMES jasperd)
-
-    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
-    SELECT_LIBRARY_CONFIGURATIONS(JASPER)
-endif ()
-
-if (JASPER_INCLUDE_DIR AND EXISTS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h")
-    file(STRINGS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h" jasper_version_str REGEX "^#define[\t ]+JAS_VERSION[\t ]+\".*\".*")
-
-    string(REGEX REPLACE "^#define[\t ]+JAS_VERSION[\t ]+\"([^\"]+)\".*" "\\1" JASPER_VERSION_STRING "${jasper_version_str}")
-endif ()
-
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jasper
-                                  REQUIRED_VARS JASPER_LIBRARIES JASPER_INCLUDE_DIR JPEG_LIBRARIES
-                                  VERSION_VAR JASPER_VERSION_STRING)
-
-if (JASPER_FOUND)
-  set(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES} )
-endif ()
-
-mark_as_advanced(JASPER_INCLUDE_DIR)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindVulkan.cmake b/deps/cmake/share/cmake-3.21/Modules/FindVulkan.cmake
deleted file mode 100644
index 4f48e135..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/FindVulkan.cmake
+++ /dev/null
@@ -1,157 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-FindVulkan
-----------
-
-.. versionadded:: 3.7
-
-Find Vulkan, which is a low-overhead, cross-platform 3D graphics
-and computing API.
-
-IMPORTED Targets
-^^^^^^^^^^^^^^^^
-
-This module defines :prop_tgt:`IMPORTED` targets if Vulkan has been found:
-
-``Vulkan::Vulkan``
-  The main Vulkan library.
-
-``Vulkan::glslc``
-  .. versionadded:: 3.19
-
-  The GLSLC SPIR-V compiler, if it has been found.
-
-``Vulkan::Headers``
-  .. versionadded:: 3.21
-
-  Provides just Vulkan headers include paths, if found.  No library is
-  included in this target.  This can be useful for applications that
-  load Vulkan library dynamically.
-
-``Vulkan::glslangValidator``
-  .. versionadded:: 3.21
-
-  The glslangValidator tool, if found.  It is used to compile GLSL and
-  HLSL shaders into SPIR-V.
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module defines the following variables::
-
-  Vulkan_FOUND          - "True" if Vulkan was found
-  Vulkan_INCLUDE_DIRS   - include directories for Vulkan
-  Vulkan_LIBRARIES      - link against this library to use Vulkan
-
-The module will also define three cache variables::
-
-  Vulkan_INCLUDE_DIR        - the Vulkan include directory
-  Vulkan_LIBRARY            - the path to the Vulkan library
-  Vulkan_GLSLC_EXECUTABLE   - the path to the GLSL SPIR-V compiler
-  Vulkan_GLSLANG_VALIDATOR_EXECUTABLE - the path to the glslangValidator tool
-
-Hints
-^^^^^
-
-.. versionadded:: 3.18
-
-The ``VULKAN_SDK`` environment variable optionally specifies the
-location of the Vulkan SDK root directory for the given
-architecture. It is typically set by sourcing the toplevel
-``setup-env.sh`` script of the Vulkan SDK directory into the shell
-environment.
-
-#]=======================================================================]
-
-if(WIN32)
-  find_path(Vulkan_INCLUDE_DIR
-    NAMES vulkan/vulkan.h
-    HINTS
-      "$ENV{VULKAN_SDK}/Include"
-    )
-
-  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    find_library(Vulkan_LIBRARY
-      NAMES vulkan-1
-      HINTS
-        "$ENV{VULKAN_SDK}/Lib"
-        "$ENV{VULKAN_SDK}/Bin"
-      )
-    find_program(Vulkan_GLSLC_EXECUTABLE
-      NAMES glslc
-      HINTS
-        "$ENV{VULKAN_SDK}/Bin"
-      )
-    find_program(Vulkan_GLSLANG_VALIDATOR_EXECUTABLE
-      NAMES glslangValidator
-      HINTS
-        "$ENV{VULKAN_SDK}/Bin"
-      )
-  elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-    find_library(Vulkan_LIBRARY
-      NAMES vulkan-1
-      HINTS
-        "$ENV{VULKAN_SDK}/Lib32"
-        "$ENV{VULKAN_SDK}/Bin32"
-      )
-    find_program(Vulkan_GLSLC_EXECUTABLE
-      NAMES glslc
-      HINTS
-        "$ENV{VULKAN_SDK}/Bin32"
-      )
-    find_program(Vulkan_GLSLANG_VALIDATOR_EXECUTABLE
-      NAMES glslangValidator
-      HINTS
-        "$ENV{VULKAN_SDK}/Bin32"
-      )
-  endif()
-else()
-  find_path(Vulkan_INCLUDE_DIR
-    NAMES vulkan/vulkan.h
-    HINTS "$ENV{VULKAN_SDK}/include")
-  find_library(Vulkan_LIBRARY
-    NAMES vulkan
-    HINTS "$ENV{VULKAN_SDK}/lib")
-  find_program(Vulkan_GLSLC_EXECUTABLE
-    NAMES glslc
-    HINTS "$ENV{VULKAN_SDK}/bin")
-  find_program(Vulkan_GLSLANG_VALIDATOR_EXECUTABLE
-    NAMES glslangValidator
-    HINTS "$ENV{VULKAN_SDK}/bin")
-endif()
-
-set(Vulkan_LIBRARIES ${Vulkan_LIBRARY})
-set(Vulkan_INCLUDE_DIRS ${Vulkan_INCLUDE_DIR})
-
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(Vulkan
-  DEFAULT_MSG
-  Vulkan_LIBRARY Vulkan_INCLUDE_DIR)
-
-mark_as_advanced(Vulkan_INCLUDE_DIR Vulkan_LIBRARY Vulkan_GLSLC_EXECUTABLE
-                 Vulkan_GLSLANG_VALIDATOR_EXECUTABLE)
-
-if(Vulkan_FOUND AND NOT TARGET Vulkan::Vulkan)
-  add_library(Vulkan::Vulkan UNKNOWN IMPORTED)
-  set_target_properties(Vulkan::Vulkan PROPERTIES
-    IMPORTED_LOCATION "${Vulkan_LIBRARIES}"
-    INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
-endif()
-
-if(Vulkan_FOUND AND NOT TARGET Vulkan::Headers)
-  add_library(Vulkan::Headers INTERFACE IMPORTED)
-  set_target_properties(Vulkan::Headers PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
-endif()
-
-if(Vulkan_FOUND AND Vulkan_GLSLC_EXECUTABLE AND NOT TARGET Vulkan::glslc)
-  add_executable(Vulkan::glslc IMPORTED)
-  set_property(TARGET Vulkan::glslc PROPERTY IMPORTED_LOCATION "${Vulkan_GLSLC_EXECUTABLE}")
-endif()
-
-if(Vulkan_FOUND AND Vulkan_GLSLANG_VALIDATOR_EXECUTABLE AND NOT TARGET Vulkan::glslangValidator)
-  add_executable(Vulkan::glslangValidator IMPORTED)
-  set_property(TARGET Vulkan::glslangValidator PROPERTY IMPORTED_LOCATION "${Vulkan_GLSLANG_VALIDATOR_EXECUTABLE}")
-endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXScriptLauncher.in b/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXScriptLauncher.in
deleted file mode 100644
index c7158604..00000000
Binary files a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXScriptLauncher.in and /dev/null differ
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in b/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in
deleted file mode 100644
index 5f5f17a1..00000000
Binary files a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in and /dev/null differ
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.distribution.dist.in b/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.distribution.dist.in
deleted file mode 100644
index f20e66c1..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.distribution.dist.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<installer-gui-script minSpecVersion="1.0">
-    <title>@CPACK_PACKAGE_NAME@</title>
-    <welcome file="@CPACK_RESOURCE_FILE_WELCOME_NOPATH@"/>
-    <readme file="@CPACK_RESOURCE_FILE_README_NOPATH@"/>
-    <license file="@CPACK_RESOURCE_FILE_LICENSE_NOPATH@"/>
-    <options allow-external-scripts="no" customize="allow" rootVolumeOnly="false"></options>
-    @CPACK_PACKAGEMAKER_CHOICES@
-</installer-gui-script>
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CheckCompilerFlag.cmake b/deps/cmake/share/cmake-3.21/Modules/Internal/CheckCompilerFlag.cmake
deleted file mode 100644
index f6a4cc96..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CheckCompilerFlag.cmake
+++ /dev/null
@@ -1,83 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-include_guard(GLOBAL)
-include(Internal/CheckSourceCompiles)
-include(CMakeCheckCompilerFlagCommonPatterns)
-
-cmake_policy(PUSH)
-cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
-cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST
-
-function(CMAKE_CHECK_COMPILER_FLAG _lang _flag _var)
-
-  if(_lang STREQUAL "C")
-    set(_lang_src "int main(void) { return 0; }")
-    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C"
-                         FAIL_REGEX "-Werror=.* argument .* is not valid for C")
-  elseif(_lang STREQUAL "CXX")
-    set(_lang_src "int main() { return 0; }")
-    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+"
-                         FAIL_REGEX "-Werror=.* argument .* is not valid for C\\+\\+")
-  elseif(_lang STREQUAL "CUDA")
-    set(_lang_src "__host__ int main() { return 0; }")
-    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+" # Host GNU
-                         FAIL_REGEX "argument unused during compilation: .*") # Clang
-  elseif(_lang STREQUAL "Fortran")
-    set(_lang_src "       program test\n       stop\n       end program")
-    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for Fortran")
-  elseif(_lang STREQUAL "HIP")
-    set(_lang_src "__host__ int main() { return 0; }")
-    set(_lang_fail_regex FAIL_REGEX "argument unused during compilation: .*") # Clang
-  elseif(_lang STREQUAL "OBJC")
-    set(_lang_src [=[
-#ifndef __OBJC__
-#  error "Not an Objective-C compiler"
-#endif
-int main(void) { return 0; }]=])
-    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for Objective-C" # GNU
-                         FAIL_REGEX "argument unused during compilation: .*") # Clang
-  elseif(_lang STREQUAL "OBJCXX")
-    set(_lang_src [=[
-#ifndef __OBJC__
-#  error "Not an Objective-C++ compiler"
-#endif
-int main(void) { return 0; }]=])
-    set(_lang_fail_regex FAIL_REGEX "command[ -]line option .* is valid for .* but not for Objective-C\\+\\+" # GNU
-                         FAIL_REGEX "argument unused during compilation: .*") # Clang
-  elseif(_lang STREQUAL "ISPC")
-    set(_lang_src "float func(uniform int32, float a) { return a / 2.25; }")
-  else()
-    message (SEND_ERROR "check_compiler_flag: ${_lang}: unknown language.")
-    return()
-  endif()
-
-  get_property (_supported_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
-  if (NOT _lang IN_LIST _supported_languages)
-    message (SEND_ERROR "check_compiler_flag: ${_lang}: needs to be enabled before use.")
-    return()
-  endif()
-
-  set(CMAKE_REQUIRED_DEFINITIONS ${_flag})
-
-  # Normalize locale during test compilation.
-  set(_locale_vars LC_ALL LC_MESSAGES LANG)
-  foreach(v IN LISTS _locale_vars)
-    set(_locale_vars_saved_${v} "$ENV{${v}}")
-    set(ENV{${v}} C)
-  endforeach()
-
-  check_compiler_flag_common_patterns(_common_patterns)
-  cmake_check_source_compiles(${_lang}
-    "${_lang_src}"
-    ${_var}
-    ${_lang_fail_regex}
-    ${_common_patterns}
-    )
-
-  foreach(v IN LISTS _locale_vars)
-    set(ENV{${v}} ${_locale_vars_saved_${v}})
-  endforeach()
-endfunction ()
-
-cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX/ExportImportList b/deps/cmake/share/cmake-3.21/Modules/Platform/AIX/ExportImportList
deleted file mode 100755
index 891bce76..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX/ExportImportList
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-# This script is internal to CMake and meant only to be
-# invoked by CMake-generated build systems on AIX.
-
-usage='usage: ExportImportList -o <out-file> [-l <lib>] [-n] [--] <objects>...'
-
-die() {
-    echo "$@" 1>&2; exit 1
-}
-
-# Process command-line arguments.
-out=''
-lib=''
-no_objects=''
-while test "$#" != 0; do
-    case "$1" in
-    -l) shift; lib="$1" ;;
-    -o) shift; out="$1" ;;
-    -n) no_objects='1' ;;
-    --) shift; break ;;
-    -*) die "$usage" ;;
-    *)  break ;;
-    esac
-    shift
-done
-test -n "$out" || die "$usage"
-
-# Build a temporary file that atomically replaces the output later.
-out_tmp="$out.tmp$$"
-trap 'rm -f "$out_tmp"' EXIT INT TERM
-> "$out_tmp"
-
-# Collect symbols exported from all object files.
-if test -z "$no_objects"; then
-    for f in "$@"; do
-        dump -tov -X 32_64 "$f" |
-        awk '
-            BEGIN {
-                V["EXPORTED"]=" export"
-                V["PROTECTED"]=" protected"
-            }
-            /^\[[0-9]+\]\tm +[^ ]+ +\.(text|data|bss) +[^ ]+ +(extern|weak) +(EXPORTED|PROTECTED| ) / {
-                if (!match($NF,/^(\.|__sinit|__sterm|__[0-9]+__)/)) {
-                    print $NF V[$(NF-1)]
-                }
-            }
-        '
-    done >> "$out_tmp"
-fi
-
-# Generate the export/import file.
-{
-    if test -n "$lib"; then
-        echo "#! $lib"
-    fi
-    sort -u "$out_tmp"
-} > "$out"
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/FreeBSD.cmake b/deps/cmake/share/cmake-3.21/Modules/Platform/FreeBSD.cmake
deleted file mode 100644
index 4a4c00dc..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/FreeBSD.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-set(CMAKE_DL_LIBS "")
-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
-# PIE link options are managed in Compiler/<compiler>.cmake file
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic
-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
-set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
-set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
-set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
-# Does not require -z origin since 10.2-RELEASE
-set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
-set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
-set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-
-# Shared libraries with no builtin soname may not be linked safely by
-# specifying the file path.
-set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
-
-# Initialize C link type selection flags.  These flags are used when
-# building a shared library, shared module, or executable that links
-# to other libraries to select whether to use the static or shared
-# versions of the libraries.
-foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
-  set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
-  set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
-endforeach()
-
-include(Platform/UnixPaths)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/GHS-MULTI-Determine.cmake b/deps/cmake/share/cmake-3.21/Modules/Platform/GHS-MULTI-Determine.cmake
deleted file mode 100644
index 349d9065..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/GHS-MULTI-Determine.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#Setup Green Hills MULTI specific compilation information
-
-if(CMAKE_HOST_UNIX)
-  set(GHS_OS_ROOT "/usr/ghs" CACHE PATH "GHS platform OS search root directory")
-else()
-  set(GHS_OS_ROOT "C:/ghs" CACHE PATH "GHS platform OS search root directory")
-endif()
-mark_as_advanced(GHS_OS_ROOT)
-
-set(GHS_OS_DIR "NOTFOUND" CACHE PATH "GHS platform OS directory")
-mark_as_advanced(GHS_OS_DIR)
-
-set(GHS_OS_DIR_OPTION "-os_dir " CACHE STRING "GHS compiler OS option")
-mark_as_advanced(GHS_OS_DIR_OPTION)
-
-#set GHS_OS_DIR if not set by user
-if(NOT GHS_OS_DIR)
-  if(EXISTS ${GHS_OS_ROOT})
-
-    #get all directories in root directory
-    FILE(GLOB GHS_CANDIDATE_OS_DIRS
-      LIST_DIRECTORIES true RELATIVE ${GHS_OS_ROOT} ${GHS_OS_ROOT}/*)
-    FILE(GLOB GHS_CANDIDATE_OS_FILES
-      LIST_DIRECTORIES false RELATIVE ${GHS_OS_ROOT} ${GHS_OS_ROOT}/*)
-    if(GHS_CANDIDATE_OS_FILES)
-      list(REMOVE_ITEM GHS_CANDIDATE_OS_DIRS ${GHS_CANDIDATE_OS_FILES})
-    endif ()
-
-    #filter based on platform name
-    if(GHS_TARGET_PLATFORM MATCHES "integrity")
-      list(FILTER GHS_CANDIDATE_OS_DIRS INCLUDE REGEX "int[0-9][0-9][0-9][0-9a-z]")
-    else() #fall-back for standalone
-      unset(GHS_CANDIDATE_OS_DIRS)
-      set(GHS_OS_DIR "IGNORE")
-    endif()
-
-    if(GHS_CANDIDATE_OS_DIRS)
-      list(SORT GHS_CANDIDATE_OS_DIRS)
-      list(GET GHS_CANDIDATE_OS_DIRS -1 GHS_OS_DIR)
-      string(CONCAT GHS_OS_DIR ${GHS_OS_ROOT} "/" ${GHS_OS_DIR})
-    endif()
-
-    #update cache with new value
-    set(GHS_OS_DIR "${GHS_OS_DIR}" CACHE PATH "GHS platform OS directory" FORCE)
-  endif()
-endif()
-
-set(GHS_BSP_NAME "IGNORE" CACHE STRING "BSP name")
-
-set(GHS_CUSTOMIZATION "" CACHE FILEPATH "optional GHS customization")
-mark_as_advanced(GHS_CUSTOMIZATION)
-set(GHS_GPJ_MACROS "" CACHE STRING "optional GHS macros generated in the .gpjs for legacy reasons")
-mark_as_advanced(GHS_GPJ_MACROS)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/NetBSD.cmake b/deps/cmake/share/cmake-3.21/Modules/Platform/NetBSD.cmake
deleted file mode 100644
index d99cb4a7..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/NetBSD.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-set(CMAKE_DL_LIBS "")
-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
-# PIE link options are managed in Compiler/<compiler>.cmake file
-set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic
-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
-set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
-set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
-set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
-set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
-set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
-set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
-set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
-
-include(Platform/UnixPaths)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS.cmake b/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS.cmake
deleted file mode 100644
index 78eccf70..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-if(CMAKE_SYSTEM MATCHES "SunOS-4")
-  set(CMAKE_C_COMPILE_OPTIONS_PIC "-PIC")
-  set(CMAKE_C_COMPILE_OPTIONS_PIE "-PIE")
-  set(CMAKE_SHARED_LIBRARY_C_FLAGS "-PIC")
-  set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-r")
-  set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R")
-  set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
-endif()
-
-include(Platform/UnixPaths)
-
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
-  /opt/csw
-  /opt/openwin
-  )
-
-# The Sun linker needs to find transitive shared library dependencies
-# in the -L path.
-set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
-
-# Shared libraries with no builtin soname may not be linked safely by
-# specifying the file path.
-set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang-ASM.cmake b/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang-ASM.cmake
deleted file mode 100644
index 345d77d0..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang-ASM.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-include(Platform/Windows-Clang)
-__windows_compiler_clang(ASM)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM.cmake b/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM.cmake
deleted file mode 100644
index b9ea0379..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-
-# This module is shared by multiple languages; use include blocker.
-if(__WINDOWS_INTEL)
-  return()
-endif()
-set(__WINDOWS_INTEL 1)
-
-include(Platform/Windows-MSVC)
-macro(__windows_compiler_intel lang)
-  __windows_compiler_msvc(${lang})
-
-  set(CMAKE_DEPFILE_FLAGS_${lang} "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
-  set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
-endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/RepositoryInfo.txt.in b/deps/cmake/share/cmake-3.21/Modules/RepositoryInfo.txt.in
deleted file mode 100644
index df8e3227..00000000
--- a/deps/cmake/share/cmake-3.21/Modules/RepositoryInfo.txt.in
+++ /dev/null
@@ -1,3 +0,0 @@
-repository='@repository@'
-module='@module@'
-tag='@tag@'
diff --git a/deps/cmake/share/cmake-3.21/Modules/AddFileDependencies.cmake b/deps/cmake/share/cmake-3.25/Modules/AddFileDependencies.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/AddFileDependencies.cmake
rename to deps/cmake/share/cmake-3.25/Modules/AddFileDependencies.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/AndroidTestUtilities.cmake b/deps/cmake/share/cmake-3.25/Modules/AndroidTestUtilities.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/AndroidTestUtilities.cmake
rename to deps/cmake/share/cmake-3.25/Modules/AndroidTestUtilities.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake b/deps/cmake/share/cmake-3.25/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
rename to deps/cmake/share/cmake-3.25/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in b/deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-ExactVersion.cmake.in b/deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-ExactVersion.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-ExactVersion.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-ExactVersion.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-SameMajorVersion.cmake.in b/deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-SameMinorVersion.cmake.in b/deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-SameMinorVersion.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/BasicConfigVersion-SameMinorVersion.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/BasicConfigVersion-SameMinorVersion.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/BundleUtilities.cmake b/deps/cmake/share/cmake-3.25/Modules/BundleUtilities.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/BundleUtilities.cmake
rename to deps/cmake/share/cmake-3.25/Modules/BundleUtilities.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeASM-ATTInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeASM-ATTInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeASM-ATTInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeASM-ATTInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeASMCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeASMCompiler.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeASMCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeASMCompiler.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeASMInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeASMInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeASMInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeASMInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeASM_MASMInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeASM_MASMInformation.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeASM_MASMInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeASM_MASMInformation.cmake
index 6d1e174e..656b75e7 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeASM_MASMInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeASM_MASMInformation.cmake
@@ -8,7 +8,7 @@ set(ASM_DIALECT "_MASM")
 
 set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm)
 
-set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> /c /Fo <OBJECT> <SOURCE>")
+set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -c -Fo <OBJECT> <SOURCE>")
 
 # The ASM_MASM compiler id for this compiler is "MSVC", so fill out the runtime library table.
 set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         "")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeASM_NASMInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeASM_NASMInformation.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeASM_NASMInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeASM_NASMInformation.cmake
index dad2750e..a72575b4 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeASM_NASMInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeASM_NASMInformation.cmake
@@ -35,7 +35,7 @@ if(NOT CMAKE_ASM_NASM_OBJECT_FORMAT)
 endif()
 
 if(NOT CMAKE_ASM_NASM_COMPILE_OBJECT)
-  set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
+  set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -f ${CMAKE_ASM_NASM_OBJECT_FORMAT} -o <OBJECT> <SOURCE>")
 endif()
 
 if(CMAKE_ASM_NASM_COMPILER_ID STREQUAL "NASM")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeAddFortranSubdirectory.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeAddFortranSubdirectory.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeAddFortranSubdirectory.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeAddFortranSubdirectory.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeAddNewLanguage.txt b/deps/cmake/share/cmake-3.25/Modules/CMakeAddNewLanguage.txt
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeAddNewLanguage.txt
rename to deps/cmake/share/cmake-3.25/Modules/CMakeAddNewLanguage.txt
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeBackwardCompatibilityC.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeBackwardCompatibilityC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeBackwardCompatibilityC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeBackwardCompatibilityC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeBackwardCompatibilityCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeBackwardCompatibilityCXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeBackwardCompatibilityCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeBackwardCompatibilityCXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeBorlandFindMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeBorlandFindMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeBorlandFindMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeBorlandFindMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeBuildSettings.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeBuildSettings.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeBuildSettings.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeBuildSettings.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCCompiler.cmake.in
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCCompiler.cmake.in
index 754f235b..2b24ff2a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCCompiler.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCCompiler.cmake.in
@@ -5,6 +5,7 @@ set(CMAKE_C_COMPILER_VERSION "@CMAKE_C_COMPILER_VERSION@")
 set(CMAKE_C_COMPILER_VERSION_INTERNAL "@CMAKE_C_COMPILER_VERSION_INTERNAL@")
 set(CMAKE_C_COMPILER_WRAPPER "@CMAKE_C_COMPILER_WRAPPER@")
 set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "@CMAKE_C_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_C_EXTENSIONS_COMPUTED_DEFAULT "@CMAKE_C_EXTENSIONS_COMPUTED_DEFAULT@")
 set(CMAKE_C_COMPILE_FEATURES "@CMAKE_C_COMPILE_FEATURES@")
 set(CMAKE_C90_COMPILE_FEATURES "@CMAKE_C90_COMPILE_FEATURES@")
 set(CMAKE_C99_COMPILE_FEATURES "@CMAKE_C99_COMPILE_FEATURES@")
@@ -30,18 +31,9 @@ set(CMAKE_COMPILER_IS_GNUCC @CMAKE_COMPILER_IS_GNUCC@)
 set(CMAKE_C_COMPILER_LOADED 1)
 set(CMAKE_C_COMPILER_WORKS @CMAKE_C_COMPILER_WORKS@)
 set(CMAKE_C_ABI_COMPILED @CMAKE_C_ABI_COMPILED@)
-set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
-set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
-if(CMAKE_COMPILER_IS_CYGWIN)
-  set(CYGWIN 1)
-  set(UNIX 1)
-endif()
 
 set(CMAKE_C_COMPILER_ENV_VAR "CC")
 
-if(CMAKE_COMPILER_IS_MINGW)
-  set(MINGW 1)
-endif()
 set(CMAKE_C_COMPILER_ID_RUN 1)
 set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m)
 set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCCompilerABI.c b/deps/cmake/share/cmake-3.25/Modules/CMakeCCompilerABI.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCCompilerABI.c
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCCompilerABI.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCCompilerId.c.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCCompilerId.c.in
similarity index 76%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCCompilerId.c.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCCompilerId.c.in
index 1f19c00e..82d56cf6 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCCompilerId.c.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCCompilerId.c.in
@@ -41,23 +41,33 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]";
 
 #if !defined(__STDC__) && !defined(__clang__)
 # if defined(_MSC_VER) || defined(__ibmxl__) || defined(__IBMC__)
-#  define C_DIALECT "90"
+#  define C_VERSION "90"
 # else
-#  define C_DIALECT
+#  define C_VERSION
 # endif
 #elif __STDC_VERSION__ > 201710L
-# define C_DIALECT "23"
+# define C_VERSION "23"
 #elif __STDC_VERSION__ >= 201710L
-# define C_DIALECT "17"
+# define C_VERSION "17"
 #elif __STDC_VERSION__ >= 201000L
-# define C_DIALECT "11"
+# define C_VERSION "11"
 #elif __STDC_VERSION__ >= 199901L
-# define C_DIALECT "99"
+# define C_VERSION "99"
 #else
-# define C_DIALECT "90"
+# define C_VERSION "90"
 #endif
-const char* info_language_dialect_default =
-  "INFO" ":" "dialect_default[" C_DIALECT "]";
+const char* info_language_standard_default =
+  "INFO" ":" "standard_default[" C_VERSION "]";
+
+const char* info_language_extensions_default = "INFO" ":" "extensions_default["
+#if (defined(__clang__) || defined(__GNUC__) || defined(__xlC__) ||           \
+     defined(__TI_COMPILER_VERSION__)) &&                                     \
+  !defined(__STRICT_ANSI__)
+  "ON"
+#else
+  "OFF"
+#endif
+"]";
 
 /*--------------------------------------------------------------------------*/
 
@@ -89,7 +99,8 @@ int main(int argc, char* argv[])
 #if defined(__CRAYXT_COMPUTE_LINUX_TARGET)
   require += info_cray[argc];
 #endif
-  require += info_language_dialect_default[argc];
+  require += info_language_standard_default[argc];
+  require += info_language_extensions_default[argc];
   (void)argv;
   return require;
 }
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeCInformation.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCInformation.cmake
index 6be18657..665f3092 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCInformation.cmake
@@ -91,6 +91,14 @@ if(CMAKE_USER_MAKE_RULES_OVERRIDE_C)
   set(CMAKE_USER_MAKE_RULES_OVERRIDE_C "${_override}")
 endif()
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_C_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_C_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
 
 # for most systems a module is the same as a shared library
 # so unless the variable CMAKE_MODULE_EXISTS is set just
@@ -196,5 +204,3 @@ if(NOT CMAKE_EXECUTABLE_RPATH_LINK_C_FLAG)
 endif()
 
 set(CMAKE_C_INFORMATION_LOADED 1)
-
-
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCSharpCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCSharpCompiler.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCSharpCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCSharpCompiler.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCSharpCompilerId.cs.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCSharpCompilerId.cs.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCSharpCompilerId.cs.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCSharpCompilerId.cs.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCSharpInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeCSharpInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCSharpInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCSharpInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompiler.cmake.in
similarity index 89%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompiler.cmake.in
index 56ae7324..57d595af 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompiler.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompiler.cmake.in
@@ -6,6 +6,7 @@ set(CMAKE_CUDA_COMPILER_VERSION "@CMAKE_CUDA_COMPILER_VERSION@")
 set(CMAKE_CUDA_DEVICE_LINKER "@CMAKE_CUDA_DEVICE_LINKER@")
 set(CMAKE_CUDA_FATBINARY "@CMAKE_CUDA_FATBINARY@")
 set(CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT "@CMAKE_CUDA_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_CUDA_EXTENSIONS_COMPUTED_DEFAULT "@CMAKE_CUDA_EXTENSIONS_COMPUTED_DEFAULT@")
 set(CMAKE_CUDA_COMPILE_FEATURES "@CMAKE_CUDA_COMPILE_FEATURES@")
 set(CMAKE_CUDA03_COMPILE_FEATURES "@CMAKE_CUDA03_COMPILE_FEATURES@")
 set(CMAKE_CUDA11_COMPILE_FEATURES "@CMAKE_CUDA11_COMPILE_FEATURES@")
@@ -49,8 +50,13 @@ endif()
 
 set(CMAKE_CUDA_COMPILER_TOOLKIT_ROOT "@CMAKE_CUDA_COMPILER_TOOLKIT_ROOT@")
 set(CMAKE_CUDA_COMPILER_TOOLKIT_LIBRARY_ROOT "@CMAKE_CUDA_COMPILER_TOOLKIT_LIBRARY_ROOT@")
+set(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION "@CMAKE_CUDA_COMPILER_TOOLKIT_VERSION@")
 set(CMAKE_CUDA_COMPILER_LIBRARY_ROOT "@CMAKE_CUDA_COMPILER_LIBRARY_ROOT@")
 
+set(CMAKE_CUDA_ARCHITECTURES_ALL "@CMAKE_CUDA_ARCHITECTURES_ALL@")
+set(CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR "@CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR@")
+set(CMAKE_CUDA_ARCHITECTURES_NATIVE "@CMAKE_CUDA_ARCHITECTURES_NATIVE@")
+
 set(CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES "@CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES@")
 
 set(CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES "@CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES@")
diff --git a/deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompilerABI.cu b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompilerABI.cu
new file mode 100644
index 00000000..8463e861
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompilerABI.cu
@@ -0,0 +1,47 @@
+#ifndef __CUDACC__
+#  error "A C or C++ compiler has been selected for CUDA"
+#endif
+
+#include <cstdio>
+
+#include <cuda_runtime.h>
+
+#include "CMakeCompilerABI.h"
+
+int main(int argc, char* argv[])
+{
+  int require = 0;
+  require += info_sizeof_dptr[argc];
+  require += info_byte_order_big_endian[argc];
+  require += info_byte_order_little_endian[argc];
+#if defined(ABI_ID)
+  require += info_abi[argc];
+#endif
+  static_cast<void>(argv);
+
+  int count = 0;
+  if (cudaGetDeviceCount(&count) != cudaSuccess || count == 0) {
+    std::fprintf(stderr, "No CUDA devices found.\n");
+    return -1;
+  }
+
+  int found = 0;
+  const char* sep = "";
+  for (int device = 0; device < count; ++device) {
+    cudaDeviceProp prop;
+    if (cudaGetDeviceProperties(&prop, device) == cudaSuccess) {
+      std::printf("%s%d%d", sep, prop.major, prop.minor);
+      sep = ";";
+      found = 1;
+    }
+  }
+
+  if (!found) {
+    std::fprintf(stderr, "No CUDA architecture detected from any devices.\n");
+    // Convince the compiler that the non-zero return value depends
+    // on the info strings so they are not optimized out.
+    return require ? -1 : 1;
+  }
+
+  return 0;
+}
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompilerId.cu.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompilerId.cu.in
similarity index 76%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompilerId.cu.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompilerId.cu.in
index 91039e5a..d5a3b036 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDACompilerId.cu.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDACompilerId.cu.in
@@ -16,7 +16,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
 @CMAKE_CUDA_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_CUDA_COMPILER_ID_ERROR_FOR_TEST@
 
-const char* info_language_dialect_default = "INFO" ":" "dialect_default["
+const char* info_language_standard_default = "INFO" ":" "standard_default["
 #if __cplusplus > 202002L
   "23"
 #elif __cplusplus > 201703L
@@ -32,6 +32,15 @@ const char* info_language_dialect_default = "INFO" ":" "dialect_default["
 #endif
 "]";
 
+const char* info_language_extensions_default = "INFO" ":" "extensions_default["
+#if (defined(__clang__) || defined(__GNUC__)) &&                              \
+  !defined(__STRICT_ANSI__)
+  "ON"
+#else
+  "OFF"
+#endif
+"]";
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -48,7 +57,8 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
-  require += info_language_dialect_default[argc];
+  require += info_language_standard_default[argc];
+  require += info_language_extensions_default[argc];
   (void)argv;
   return require;
 }
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDAInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDAInformation.cmake
similarity index 86%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCUDAInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCUDAInformation.cmake
index a2946f45..dea721eb 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCUDAInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCUDAInformation.cmake
@@ -100,6 +100,15 @@ if(NOT CMAKE_MODULE_EXISTS)
   set(CMAKE_SHARED_MODULE_CREATE_CUDA_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_CUDA_FLAGS})
 endif()
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_CUDA_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_CUDA_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
+
 # add the flags to the cache based
 # on the initial values computed in the platform/*.cmake files
 # use _INIT variables so that this only happens the first time
@@ -151,22 +160,9 @@ if(NOT DEFINED CMAKE_CUDA_ARCHIVE_FINISH)
   set(CMAKE_CUDA_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 endif()
 
-#Specify how to compile when ptx has been requested
-if(NOT CMAKE_CUDA_COMPILE_PTX_COMPILATION)
-  set(CMAKE_CUDA_COMPILE_PTX_COMPILATION
-    "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} ${_CMAKE_CUDA_PTX_FLAG} <SOURCE> -o <OBJECT>")
-endif()
-
-#Specify how to compile when separable compilation has been requested
-if(NOT CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION)
-  set(CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION
-    "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} ${_CMAKE_CUDA_DEVICE_CODE} <SOURCE> -o <OBJECT>")
-endif()
-
-#Specify how to compile when whole compilation has been requested
-if(NOT CMAKE_CUDA_COMPILE_WHOLE_COMPILATION)
-  set(CMAKE_CUDA_COMPILE_WHOLE_COMPILATION
-    "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} -c <SOURCE> -o <OBJECT>")
+if(NOT CMAKE_CUDA_COMPILE_OBJECT)
+  set(CMAKE_CUDA_COMPILE_OBJECT
+    "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} <CUDA_COMPILE_MODE> <SOURCE> -o <OBJECT>")
 endif()
 
 # compile a cu file into an executable
@@ -202,7 +198,7 @@ endif()
 
 # Used when device linking is handled by CMake.
 if(NOT CMAKE_CUDA_DEVICE_LINK_COMPILE)
-  set(CMAKE_CUDA_DEVICE_LINK_COMPILE "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <FLAGS> -D__CUDA_INCLUDE_COMPILER_INTERNAL_HEADERS__ -D__NV_EXTRA_INITIALIZATION=\"\" -D__NV_EXTRA_FINALIZATION=\"\" -DREGISTERLINKBINARYFILE=\\\"<REGISTER_FILE>\\\" -DFATBINFILE=\\\"<FATBINARY>\\\" ${_CMAKE_COMPILE_AS_CUDA_FLAG} -c \"${CMAKE_CUDA_COMPILER_TOOLKIT_LIBRARY_ROOT}/bin/crt/link.stub\" -o <OBJECT>")
+  set(CMAKE_CUDA_DEVICE_LINK_COMPILE "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <FLAGS> <LINK_FLAGS> -D__CUDA_INCLUDE_COMPILER_INTERNAL_HEADERS__ -D__NV_EXTRA_INITIALIZATION=\"\" -D__NV_EXTRA_FINALIZATION=\"\" -DREGISTERLINKBINARYFILE=\\\"<REGISTER_FILE>\\\" -DFATBINFILE=\\\"<FATBINARY>\\\" ${_CMAKE_COMPILE_AS_CUDA_FLAG} -c \"${CMAKE_CUDA_COMPILER_TOOLKIT_LIBRARY_ROOT}/bin/crt/link.stub\" -o <OBJECT>")
 endif()
 
 unset(__IMPLICIT_DLINK_FLAGS)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompiler.cmake.in
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompiler.cmake.in
index d0ce77a7..534e9605 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompiler.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompiler.cmake.in
@@ -5,6 +5,7 @@ set(CMAKE_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@")
 set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "@CMAKE_CXX_COMPILER_VERSION_INTERNAL@")
 set(CMAKE_CXX_COMPILER_WRAPPER "@CMAKE_CXX_COMPILER_WRAPPER@")
 set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "@CMAKE_CXX_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_CXX_EXTENSIONS_COMPUTED_DEFAULT "@CMAKE_CXX_EXTENSIONS_COMPUTED_DEFAULT@")
 set(CMAKE_CXX_COMPILE_FEATURES "@CMAKE_CXX_COMPILE_FEATURES@")
 set(CMAKE_CXX98_COMPILE_FEATURES "@CMAKE_CXX98_COMPILE_FEATURES@")
 set(CMAKE_CXX11_COMPILE_FEATURES "@CMAKE_CXX11_COMPILE_FEATURES@")
@@ -31,18 +32,9 @@ set(CMAKE_COMPILER_IS_GNUCXX @CMAKE_COMPILER_IS_GNUCXX@)
 set(CMAKE_CXX_COMPILER_LOADED 1)
 set(CMAKE_CXX_COMPILER_WORKS @CMAKE_CXX_COMPILER_WORKS@)
 set(CMAKE_CXX_ABI_COMPILED @CMAKE_CXX_ABI_COMPILED@)
-set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
-set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
-if(CMAKE_COMPILER_IS_CYGWIN)
-  set(CYGWIN 1)
-  set(UNIX 1)
-endif()
 
 set(CMAKE_CXX_COMPILER_ENV_VAR "CXX")
 
-if(CMAKE_COMPILER_IS_MINGW)
-  set(MINGW 1)
-endif()
 set(CMAKE_CXX_COMPILER_ID_RUN 1)
 set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;mpp;CPP;ixx;cppm)
 set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompilerABI.cpp b/deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompilerABI.cpp
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompilerABI.cpp
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompilerABI.cpp
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompilerId.cpp.in b/deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompilerId.cpp.in
similarity index 81%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompilerId.cpp.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompilerId.cpp.in
index 7362a083..26433262 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCXXCompilerId.cpp.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCXXCompilerId.cpp.in
@@ -49,7 +49,7 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]";
 #  define CXX_STD __cplusplus
 #endif
 
-const char* info_language_dialect_default = "INFO" ":" "dialect_default["
+const char* info_language_standard_default = "INFO" ":" "standard_default["
 #if CXX_STD > 202002L
   "23"
 #elif CXX_STD > 201703L
@@ -65,6 +65,16 @@ const char* info_language_dialect_default = "INFO" ":" "dialect_default["
 #endif
 "]";
 
+const char* info_language_extensions_default = "INFO" ":" "extensions_default["
+#if (defined(__clang__) || defined(__GNUC__) || defined(__xlC__) ||           \
+     defined(__TI_COMPILER_VERSION__)) &&                                     \
+  !defined(__STRICT_ANSI__)
+  "ON"
+#else
+  "OFF"
+#endif
+"]";
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -72,6 +82,7 @@ int main(int argc, char* argv[])
   int require = 0;
   require += info_compiler[argc];
   require += info_platform[argc];
+  require += info_arch[argc];
 #ifdef COMPILER_VERSION_MAJOR
   require += info_version[argc];
 #endif
@@ -87,7 +98,8 @@ int main(int argc, char* argv[])
 #if defined(__CRAYXT_COMPUTE_LINUX_TARGET)
   require += info_cray[argc];
 #endif
-  require += info_language_dialect_default[argc];
+  require += info_language_standard_default[argc];
+  require += info_language_extensions_default[argc];
   (void)argv;
   return require;
 }
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCXXInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeCXXInformation.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCXXInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCXXInformation.cmake
index 944d2360..53abf378 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCXXInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCXXInformation.cmake
@@ -193,6 +193,15 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   endif()
 endforeach()
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_CXX_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_CXX_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
+
 # add the flags to the cache based
 # on the initial values computed in the platform/*.cmake files
 # use _INIT variables so that this only happens the first time
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index 05174de8..bda1d711 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -32,5 +32,6 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
     FAIL_REGEX "Warning: illegal option"                   # SunStudio 12
     FAIL_REGEX "[Ww]arning: Invalid suboption"             # Fujitsu
     FAIL_REGEX "An invalid option .* appears on the command line" # Cray
+    FAIL_REGEX "WARNING: invalid compiler option"          # TI armcl
   )
 endmacro ()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCommonLanguageInclude.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeCommonLanguageInclude.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCommonLanguageInclude.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCommonLanguageInclude.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCompilerABI.h b/deps/cmake/share/cmake-3.25/Modules/CMakeCompilerABI.h
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCompilerABI.h
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCompilerABI.h
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeCompilerIdDetection.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeCompilerIdDetection.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeCompilerIdDetection.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeCompilerIdDetection.cmake
index dd70d828..75d33e89 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeCompilerIdDetection.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeCompilerIdDetection.cmake
@@ -59,6 +59,7 @@ function(compiler_id_detection outvar lang)
       HP
       Compaq
       zOS
+      IBMClang
       XLClang
       XL
       VisualAge
@@ -69,6 +70,7 @@ function(compiler_id_detection outvar lang)
       FujitsuClang
       Fujitsu
       GHS
+      Tasking
     )
     if ("x${lang}" STREQUAL "xC")
       list(APPEND ordered_compilers
@@ -82,11 +84,9 @@ function(compiler_id_detection outvar lang)
       AppleClang
       ARMClang
     )
-    if(NOT __skip_rocmclang)
-      list(APPEND ordered_compilers ROCMClang)
-    endif()
     list(APPEND ordered_compilers
       Clang
+      LCC
       GNU
       MSVC
       ADSP
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeConfigurableFile.in b/deps/cmake/share/cmake-3.25/Modules/CMakeConfigurableFile.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeConfigurableFile.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeConfigurableFile.in
diff --git a/deps/cmake/share/cmake-3.25/Modules/CMakeDependentOption.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDependentOption.cmake
new file mode 100644
index 00000000..9a3c9406
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDependentOption.cmake
@@ -0,0 +1,92 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+CMakeDependentOption
+--------------------
+
+Macro to provide an option dependent on other options.
+
+This macro presents an option to the user only if a set of other
+conditions are true.
+
+.. command:: cmake_dependent_option
+
+  .. code-block:: cmake
+
+    cmake_dependent_option(<option> "<help_text>" <value> <depends> <force>)
+
+  Makes ``<option>`` available to the user if the
+  :ref:`semicolon-separated list <CMake Language Lists>` of conditions in
+  ``<depends>`` are all true.  Otherwise, a local variable named ``<option>``
+  is set to ``<force>``.
+
+  When ``<option>`` is available, the given ``<help_text>`` and initial
+  ``<value>`` are used. Otherwise, any value set by the user is preserved for
+  when ``<depends>`` is satisfied in the future.
+
+  Note that the ``<option>`` variable only has a value which satisfies the
+  ``<depends>`` condition within the scope of the caller because it is a local
+  variable.
+
+Example invocation:
+
+.. code-block:: cmake
+
+  cmake_dependent_option(USE_FOO "Use Foo" ON "USE_BAR;NOT USE_ZOT" OFF)
+
+If ``USE_BAR`` is true and ``USE_ZOT`` is false, this provides an option called
+``USE_FOO`` that defaults to ON. Otherwise, it sets ``USE_FOO`` to OFF and
+hides the option from the user. If the status of ``USE_BAR`` or ``USE_ZOT``
+ever changes, any value for the ``USE_FOO`` option is saved so that when the
+option is re-enabled it retains its old value.
+
+.. versionadded:: 3.22
+
+  Full :ref:`Condition Syntax` is now supported.  See policy :policy:`CMP0127`.
+
+#]=======================================================================]
+
+macro(CMAKE_DEPENDENT_OPTION option doc default depends force)
+  cmake_policy(GET CMP0127 _CDO_CMP0127
+    PARENT_SCOPE # undocumented, do not use outside of CMake
+    )
+  if(${option}_ISSET MATCHES "^${option}_ISSET$")
+    set(${option}_AVAILABLE 1)
+    if("x${_CDO_CMP0127}x" STREQUAL "xNEWx")
+      foreach(d ${depends})
+        cmake_language(EVAL CODE "
+          if (${d})
+          else()
+            set(${option}_AVAILABLE 0)
+          endif()"
+        )
+      endforeach()
+    else()
+      foreach(d ${depends})
+        string(REGEX REPLACE " +" ";" CMAKE_DEPENDENT_OPTION_DEP "${d}")
+        if(${CMAKE_DEPENDENT_OPTION_DEP})
+        else()
+          set(${option}_AVAILABLE 0)
+        endif()
+      endforeach()
+    endif()
+    if(${option}_AVAILABLE)
+      option(${option} "${doc}" "${default}")
+      set(${option} "${${option}}" CACHE BOOL "${doc}" FORCE)
+    else()
+      if(${option} MATCHES "^${option}$")
+      else()
+        set(${option} "${${option}}" CACHE INTERNAL "${doc}")
+      endif()
+      set(${option} ${force})
+    endif()
+  else()
+    set(${option} "${${option}_ISSET}")
+  endif()
+  if("x${_CDO_CMP0127}x" STREQUAL "xx" AND "x${depends}x" MATCHES "[^A-Za-z0-9_.; ]")
+    cmake_policy(GET_WARNING CMP0127 _CDO_CMP0127_WARNING)
+    message(AUTHOR_WARNING "${_CDO_CMP0127_WARNING}")
+  endif()
+  unset(_CDO_CMP0127)
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASM-ATTCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASM-ATTCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASM-ATTCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASM-ATTCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASMCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASMCompiler.cmake
similarity index 90%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASMCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASMCompiler.cmake
index e8b9db79..5ec2972b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASMCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASMCompiler.cmake
@@ -104,7 +104,7 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
 
   list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS ARMCC)
   set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_ARMCC )
-  set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_ARMCC "(ARM Compiler)|(ARM Assembler)")
+  set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_ARMCC "(ARM Compiler)|(ARM Assembler)|(Arm Compiler)")
 
   list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS NASM)
   set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_NASM "-v")
@@ -125,18 +125,31 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   include(CMakeDetermineCompilerId)
   set(userflags)
   CMAKE_DETERMINE_COMPILER_ID_VENDOR(ASM${ASM_DIALECT} "${userflags}")
+  set(_variant "")
   if("x${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}" STREQUAL "xIAR")
     # primary necessary to detect architecture, so the right archiver and linker can be picked
     # eg. "IAR Assembler V8.10.1.12857/W32 for ARM" or "IAR Assembler V4.11.1.4666 for Renesas RX"
-    # Cut out identification first, newline handling is a pain
+    # Earlier versions did not provide `--version`, so grep the full output to extract Assembler ID string
     string(REGEX MATCH "IAR Assembler[^\r\n]*" _compileid "${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_OUTPUT}")
     if("${_compileid}" MATCHES "V([0-9]+\\.[0-9]+\\.[0-9]+)")
       set(CMAKE_ASM${ASM_DIALECT}_COMPILER_VERSION ${CMAKE_MATCH_1})
     endif()
-    string(REGEX MATCHALL "([A-Za-z0-9-]+)" _all_compileid_matches "${_compileid}")
-    if(_all_compileid_matches)
-      list(GET _all_compileid_matches "-1" CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID)
+    if("${_compileid}" MATCHES "for.*(MSP430|8051|ARM|AVR|RH850|RISC-?V|RL78|RX|STM8|V850)")
+      set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID ${CMAKE_MATCH_1})
     endif()
+  elseif("x${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}" STREQUAL "xClang")
+    # Test whether an MSVC-like command-line option works.
+    execute_process(COMMAND ${CMAKE_ASM${ASM_DIALECT}_COMPILER} -?
+      OUTPUT_VARIABLE _clang_output
+      ERROR_VARIABLE _clang_output
+      RESULT_VARIABLE _clang_result)
+      if(_clang_result EQUAL 0)
+        set(CMAKE_ASM${ASM_DIALECT}_COMPILER_FRONTEND_VARIANT "MSVC")
+        set(CMAKE_ASM${ASM_DIALECT}_SIMULATE_ID MSVC)
+      else()
+        set(CMAKE_ASM${ASM_DIALECT}_COMPILER_FRONTEND_VARIANT "GNU")
+      endif()
+      set(_variant " with ${CMAKE_ASM${ASM_DIALECT}_COMPILER_FRONTEND_VARIANT}-like command-line")
   endif()
 
   _cmake_find_compiler_sysroot(ASM${ASM_DIALECT})
@@ -144,6 +157,8 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   unset(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_OUTPUT)
   unset(_all_compileid_matches)
   unset(_compileid)
+  unset(_clang_result)
+  unset(_clang_output)
 endif()
 
 if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
@@ -157,9 +172,10 @@ if(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID)
   else()
     set(_archid "")
   endif()
-  message(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}${_archid}${_version}")
+  message(STATUS "The ASM${ASM_DIALECT} compiler identification is ${CMAKE_ASM${ASM_DIALECT}_COMPILER_ID}${_archid}${_version}${_variant}")
   unset(_archid)
   unset(_version)
+  unset(_variant)
 else()
   message(STATUS "The ASM${ASM_DIALECT} compiler identification is unknown")
 endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASM_MASMCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASM_MASMCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASM_MASMCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASM_MASMCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASM_NASMCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASM_NASMCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineASM_NASMCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineASM_NASMCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCCompiler.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCCompiler.cmake
index 0f80f9cf..f5298dff 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCCompiler.cmake
@@ -128,11 +128,6 @@ if(NOT CMAKE_C_COMPILER_ID_RUN)
   if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_COMPILER_IS_GNUCC 1)
   endif()
-  if(CMAKE_C_PLATFORM_ID MATCHES "MinGW")
-    set(CMAKE_COMPILER_IS_MINGW 1)
-  elseif(CMAKE_C_PLATFORM_ID MATCHES "Cygwin")
-    set(CMAKE_COMPILER_IS_CYGWIN 1)
-  endif()
 else()
   if(NOT DEFINED CMAKE_C_COMPILER_FRONTEND_VARIANT)
     # Some toolchain files set our internal CMAKE_C_COMPILER_ID_RUN
@@ -165,7 +160,7 @@ endif ()
 # "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
 if (NOT _CMAKE_TOOLCHAIN_PREFIX)
 
-  if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|QCC")
+  if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|QCC|LCC")
     get_filename_component(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME)
     if (COMPILER_BASENAME MATCHES "^(.+-)?(clang|g?cc)(-cl)?(-[0-9]+(\\.[0-9]+)*)?(-[^.]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCSharpCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCSharpCompiler.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCSharpCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCSharpCompiler.cmake
index da860a84..fe984693 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCSharpCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCSharpCompiler.cmake
@@ -3,7 +3,7 @@
 
 if(NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio ([^9]|[9][0-9])")
   message(FATAL_ERROR
-    "C# is currently only supported for Microsoft Visual Studio 2010 and later.")
+    "C# is currently only supported for Microsoft Visual Studio 11 2012 and later.")
 endif()
 
 include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCUDACompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCUDACompiler.cmake
similarity index 82%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCUDACompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCUDACompiler.cmake
index e360d312..f43b17bb 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCUDACompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCUDACompiler.cmake
@@ -18,16 +18,16 @@ else()
   if(NOT CMAKE_CUDA_COMPILER)
     set(CMAKE_CUDA_COMPILER_INIT NOTFOUND)
 
-      # prefer the environment variable CUDACXX
-      if(NOT $ENV{CUDACXX} STREQUAL "")
-        get_filename_component(CMAKE_CUDA_COMPILER_INIT $ENV{CUDACXX} PROGRAM PROGRAM_ARGS CMAKE_CUDA_FLAGS_ENV_INIT)
-        if(CMAKE_CUDA_FLAGS_ENV_INIT)
-          set(CMAKE_CUDA_COMPILER_ARG1 "${CMAKE_CUDA_FLAGS_ENV_INIT}" CACHE STRING "Arguments to CXX compiler")
-        endif()
-        if(NOT EXISTS ${CMAKE_CUDA_COMPILER_INIT})
-          message(FATAL_ERROR "Could not find compiler set in environment variable CUDACXX:\n$ENV{CUDACXX}.\n${CMAKE_CUDA_COMPILER_INIT}")
-        endif()
+    # prefer the environment variable CUDACXX
+    if(NOT $ENV{CUDACXX} STREQUAL "")
+      get_filename_component(CMAKE_CUDA_COMPILER_INIT $ENV{CUDACXX} PROGRAM PROGRAM_ARGS CMAKE_CUDA_FLAGS_ENV_INIT)
+      if(CMAKE_CUDA_FLAGS_ENV_INIT)
+        set(CMAKE_CUDA_COMPILER_ARG1 "${CMAKE_CUDA_FLAGS_ENV_INIT}" CACHE STRING "Arguments to CUDA compiler")
       endif()
+      if(NOT EXISTS ${CMAKE_CUDA_COMPILER_INIT})
+        message(FATAL_ERROR "Could not find compiler set in environment variable CUDACXX:\n$ENV{CUDACXX}.\n${CMAKE_CUDA_COMPILER_INIT}")
+      endif()
+    endif()
 
     # finally list compilers to try
     if(NOT CMAKE_CUDA_COMPILER_INIT)
@@ -78,10 +78,11 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
       message(FATAL_ERROR "Clang with CUDA is not yet supported on Windows. See CMake issue #20776.")
     endif()
 
-    # Find the CUDA toolkit. We store the CMAKE_CUDA_COMPILER_TOOLKIT_ROOT and CMAKE_CUDA_COMPILER_LIBRARY_ROOT
-    # in CMakeCUDACompiler.cmake, so FindCUDAToolkit can avoid searching on future runs and the toolkit stays the same.
+    # Find the CUDA toolkit. We store the CMAKE_CUDA_COMPILER_TOOLKIT_ROOT, CMAKE_CUDA_COMPILER_TOOLKIT_VERSION and
+    # CMAKE_CUDA_COMPILER_LIBRARY_ROOT in CMakeCUDACompiler.cmake so FindCUDAToolkit can avoid searching on future
+    # runs and the toolkit is the same.
     # This is very similar to FindCUDAToolkit, but somewhat simplified since we can issue fatal errors
-    # if we fail to find things we need and we don't need to account for searching the libraries.
+    # if we fail and we don't need to account for searching the libraries.
 
     # For NVCC we can easily deduce the SDK binary directory from the compiler path.
     if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
@@ -192,17 +193,31 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
       get_filename_component(CMAKE_CUDA_COMPILER_TOOLKIT_ROOT "${_CUDA_NVCC_EXECUTABLE}" DIRECTORY)
       get_filename_component(CMAKE_CUDA_COMPILER_TOOLKIT_ROOT "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}" DIRECTORY)
     endif()
+
+    if(_CUDA_NVCC_OUT MATCHES "\\#\\$ NVVMIR_LIBRARY_DIR=([^\r\n]*)")
+      get_filename_component(_CUDA_NVVMIR_LIBRARY_DIR "${CMAKE_MATCH_1}" ABSOLUTE)
+
+      #We require the path to end in `/nvvm/libdevice'
+      if(_CUDA_NVVMIR_LIBRARY_DIR MATCHES "nvvm/libdevice$")
+        get_filename_component(_CUDA_NVVMIR_LIBRARY_DIR "${_CUDA_NVVMIR_LIBRARY_DIR}/../.." ABSOLUTE)
+        set(CMAKE_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR "${_CUDA_NVVMIR_LIBRARY_DIR}")
+      endif()
+
+      unset(_CUDA_NVVMIR_LIBRARY_DIR)
+      unset(_cuda_nvvmir_dir_name)
+    endif()
     unset(_CUDA_NVCC_OUT)
 
     set(CMAKE_CUDA_DEVICE_LINKER "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/bin/nvlink${CMAKE_EXECUTABLE_SUFFIX}")
     set(CMAKE_CUDA_FATBINARY "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/bin/fatbinary${CMAKE_EXECUTABLE_SUFFIX}")
 
-
     # In a non-scattered installation the following are equivalent to CMAKE_CUDA_COMPILER_TOOLKIT_ROOT.
     # We first check for a non-scattered installation to prefer it over a scattered installation.
 
     # CMAKE_CUDA_COMPILER_LIBRARY_ROOT contains the device library.
-    if(EXISTS "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/nvvm/libdevice")
+    if(DEFINED CMAKE_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR)
+      set(CMAKE_CUDA_COMPILER_LIBRARY_ROOT "${CMAKE_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR}")
+    elseif(EXISTS "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/nvvm/libdevice")
       set(CMAKE_CUDA_COMPILER_LIBRARY_ROOT "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}")
     elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/nvvm/libdevice")
       set(CMAKE_CUDA_COMPILER_LIBRARY_ROOT "${CMAKE_SYSROOT_LINK}/usr/lib/cuda")
@@ -211,6 +226,7 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
     else()
       message(FATAL_ERROR "Couldn't find CUDA library root.")
     endif()
+    unset(CMAKE_CUDA_COMPILER_LIBRARY_ROOT_FROM_NVVMIR_LIBRARY_DIR)
 
     # CMAKE_CUDA_COMPILER_TOOLKIT_LIBRARY_ROOT contains the linking stubs necessary for device linking and other low-level library files.
     if(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/nvidia-cuda-toolkit/bin/crt/link.stub")
@@ -222,17 +238,29 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
     endif()
   endif()
 
+  # For regular nvcc we the toolkit version is the same as the compiler version and we can parse it from the vendor test output.
+  # For Clang we need to invoke nvcc to get version output.
+  if(NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+    if(CMAKE_CUDA_COMPILER_ID STREQUAL "Clang")
+      execute_process(COMMAND ${_CUDA_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE CMAKE_CUDA_COMPILER_ID_OUTPUT)
+    endif()
+
+    if(CMAKE_CUDA_COMPILER_ID_OUTPUT MATCHES [=[V([0-9]+\.[0-9]+\.[0-9]+)]=])
+      set(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION "${CMAKE_MATCH_1}")
+    endif()
+  endif()
+
   set(CMAKE_CUDA_COMPILER_ID_FLAGS_ALWAYS "-v")
 
   if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
     set(nvcc_test_flags "--keep --keep-dir tmp")
     if(CMAKE_CUDA_HOST_COMPILER)
       string(APPEND nvcc_test_flags " -ccbin=\"${CMAKE_CUDA_HOST_COMPILER}\"")
-
-      # If the user has specified a host compiler we should fail instead of trying without.
-      # Succeeding detection without may result in confusing errors later on, see #21076.
-      set(CMAKE_CUDA_COMPILER_ID_REQUIRE_SUCCESS ON)
     endif()
+    # If we have extracted the vendor as NVIDIA we should require detection to
+    # work. If we don't, users will get confusing errors later about failure
+    # to detect a default value for CMAKE_CUDA_ARCHITECTURES
+    set(CMAKE_CUDA_COMPILER_ID_REQUIRE_SUCCESS ON)
   elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "Clang")
     set(clang_test_flags "--cuda-path=\"${CMAKE_CUDA_COMPILER_LIBRARY_ROOT}\"")
     if(CMAKE_CROSSCOMPILING)
@@ -241,39 +269,35 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
     endif()
   endif()
 
-  # Append user-specified architectures.
-  if(CMAKE_CUDA_ARCHITECTURES)
-    foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
-      # Strip specifiers as PTX vs binary doesn't matter.
-      string(REGEX MATCH "[0-9]+" arch_name "${arch}")
-      string(APPEND clang_test_flags " --cuda-gpu-arch=sm_${arch_name}")
-      string(APPEND nvcc_test_flags " -gencode=arch=compute_${arch_name},code=sm_${arch_name}")
-      list(APPEND tested_architectures "${arch_name}")
-    endforeach()
-
-    # If the user has specified architectures we'll want to fail during compiler detection if they don't work.
-    set(CMAKE_CUDA_COMPILER_ID_REQUIRE_SUCCESS ON)
+  # Rest of the code treats an empty value as equivalent to "use the defaults".
+  # Error out early to prevent confusing errors as a result of this.
+  # Note that this also catches invalid non-numerical values such as "a".
+  if(DEFINED CMAKE_CUDA_ARCHITECTURES)
+    if(CMAKE_CUDA_ARCHITECTURES STREQUAL "")
+      message(FATAL_ERROR "CMAKE_CUDA_ARCHITECTURES must be non-empty if set.")
+    elseif(CMAKE_CUDA_ARCHITECTURES AND NOT CMAKE_CUDA_ARCHITECTURES MATCHES "^([0-9]+a?(-real|-virtual)?(;[0-9]+a?(-real|-virtual)?|;)*|all|all-major|native)$")
+      message(FATAL_ERROR
+        "CMAKE_CUDA_ARCHITECTURES:\n"
+        "  ${CMAKE_CUDA_ARCHITECTURES}\n"
+        "is not one of the following:\n"
+        "  * a semicolon-separated list of integers, each optionally\n"
+        "    followed by '-real' or '-virtual'\n"
+        "  * a special value: all, all-major, native\n"
+        )
+    endif()
   endif()
 
   if(CMAKE_CUDA_COMPILER_ID STREQUAL "Clang")
-    if(NOT CMAKE_CUDA_ARCHITECTURES)
-      # Clang doesn't automatically select an architecture supported by the SDK.
-      # Try in reverse order of deprecation with the most recent at front (i.e. the most likely to work for new setups).
-      foreach(arch "20" "30" "52")
-        list(APPEND CMAKE_CUDA_COMPILER_ID_TEST_FLAGS_FIRST "${clang_test_flags} --cuda-gpu-arch=sm_${arch}")
-      endforeach()
-    endif()
-
-    # If the user specified CMAKE_CUDA_ARCHITECTURES this will include all the architecture flags.
-    # Otherwise this won't include any architecture flags and we'll fallback to Clang's defaults.
-    list(APPEND CMAKE_CUDA_COMPILER_ID_TEST_FLAGS_FIRST "${clang_test_flags}")
+    # Clang doesn't automatically select an architecture supported by the SDK.
+    # Try in reverse order of deprecation with the most recent at front (i.e. the most likely to work for new setups).
+    foreach(arch "52" "30" "20")
+      list(APPEND CMAKE_CUDA_COMPILER_ID_TEST_FLAGS_FIRST "${clang_test_flags} --cuda-gpu-arch=sm_${arch}")
+    endforeach()
   elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
     list(APPEND CMAKE_CUDA_COMPILER_ID_TEST_FLAGS_FIRST "${nvcc_test_flags}")
   endif()
 
   # We perform compiler identification for a second time to extract implicit linking info and host compiler for NVCC.
-  # We also use it to verify that CMAKE_CUDA_ARCHITECTURES and additionally on Clang that CUDA toolkit path works.
-  # The latter could be done during compiler testing in the future to avoid doing this for Clang.
   # We need to unset the compiler ID otherwise CMAKE_DETERMINE_COMPILER_ID() doesn't work.
   set(CMAKE_CUDA_COMPILER_ID)
   set(CMAKE_CUDA_PLATFORM_ID)
@@ -287,8 +311,13 @@ if(NOT CMAKE_CUDA_COMPILER_ID_RUN)
     get_filename_component(CMAKE_CUDA_COMPILER_TOOLKIT_ROOT "${CMAKE_CUDA_COMPILER}" DIRECTORY)
     get_filename_component(CMAKE_CUDA_COMPILER_TOOLKIT_ROOT "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}" DIRECTORY)
     set(CMAKE_CUDA_COMPILER_LIBRARY_ROOT "${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}")
+
+    # The compiler comes with the toolkit, so the versions are the same.
+    set(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION ${CMAKE_CUDA_COMPILER_VERSION})
   endif()
 
+  include(${CMAKE_ROOT}/Modules/CUDA/architectures.cmake)
+
   _cmake_find_compiler_sysroot(CUDA)
 endif()
 
@@ -322,18 +351,12 @@ if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
   set(_SET_CMAKE_CUDA_RUNTIME_LIBRARY_DEFAULT
     "set(CMAKE_CUDA_RUNTIME_LIBRARY_DEFAULT \"${CMAKE_CUDA_RUNTIME_LIBRARY_DEFAULT}\")")
 elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "Clang")
-  if(NOT CMAKE_CUDA_ARCHITECTURES)
-    # Find the architecture that we successfully compiled using and set it as the default.
-    string(REGEX MATCH "-target-cpu sm_([0-9]+)" dont_care "${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}")
-    set(detected_architecture "${CMAKE_MATCH_1}")
-  else()
-    string(REGEX MATCHALL "-target-cpu sm_([0-9]+)" target_cpus "${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}")
+  string(REGEX MATCHALL "-target-cpu sm_([0-9]+)" target_cpus "${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}")
 
-    foreach(cpu ${target_cpus})
-      string(REGEX MATCH "-target-cpu sm_([0-9]+)" dont_care "${cpu}")
-      list(APPEND architectures "${CMAKE_MATCH_1}")
-    endforeach()
-  endif()
+  foreach(cpu ${target_cpus})
+    string(REGEX MATCH "-target-cpu sm_([0-9]+)" dont_care "${cpu}")
+    list(APPEND architectures_detected "${CMAKE_MATCH_1}")
+  endforeach()
 
   # Find target directory when crosscompiling.
   if(CMAKE_CROSSCOMPILING)
@@ -426,9 +449,10 @@ elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
       if("${_nvcc_output_line}" MATCHES "^ *nvlink")
         string(APPEND _nvcc_log "    ignoring nvlink line\n")
       elseif(_nvcc_libraries)
-        if("${_nvcc_output_line}" MATCHES "(@\"?tmp/a\\.exe\\.res\"?)")
+        if("${_nvcc_output_line}" MATCHES "(@\"?((tmp/)?a\\.exe\\.res)\"?)")
           set(_nvcc_link_res_arg "${CMAKE_MATCH_1}")
-          set(_nvcc_link_res "${CMAKE_PLATFORM_INFO_DIR}/CompilerIdCUDA/tmp/a.exe.res")
+          set(_nvcc_link_res_file "${CMAKE_MATCH_2}")
+          set(_nvcc_link_res "${CMAKE_PLATFORM_INFO_DIR}/CompilerIdCUDA/${_nvcc_link_res_file}")
           if(EXISTS "${_nvcc_link_res}")
             file(READ "${_nvcc_link_res}" _nvcc_link_res_content)
             string(REPLACE "${_nvcc_link_res_arg}" "${_nvcc_link_res_content}" _nvcc_output_line "${_nvcc_output_line}")
@@ -479,7 +503,8 @@ elseif(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
                                    CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES
                                    CMAKE_CUDA_HOST_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
                                    log
-                                   "${CMAKE_CUDA_IMPLICIT_OBJECT_REGEX}")
+                                   "${CMAKE_CUDA_IMPLICIT_OBJECT_REGEX}"
+                                   LANGUAGE CUDA)
 
     # Detect CMAKE_CUDA_RUNTIME_LIBRARY_DEFAULT from the compiler by looking at which
     # cudart library exists in the implicit link libraries passed to the host linker.
@@ -558,46 +583,25 @@ if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
       "Failed to detect CUDA nvcc include information:\n${_nvcc_log}\n\n")
   endif()
 
-  # Parse default CUDA architecture.
-  cmake_policy(GET CMP0104 _CUDA_CMP0104)
-  if(NOT CMAKE_CUDA_ARCHITECTURES AND _CUDA_CMP0104 STREQUAL "NEW")
-    string(REGEX MATCH "arch[ =]compute_([0-9]+)" dont_care "${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}")
-    set(detected_architecture "${CMAKE_MATCH_1}")
-  elseif(CMAKE_CUDA_ARCHITECTURES)
-    string(REGEX MATCHALL "-arch compute_([0-9]+)" target_cpus "${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}")
+  string(REGEX MATCHALL "-arch compute_([0-9]+)" target_cpus "${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}")
 
-    foreach(cpu ${target_cpus})
-      string(REGEX MATCH "-arch compute_([0-9]+)" dont_care "${cpu}")
-      list(APPEND architectures "${CMAKE_MATCH_1}")
-    endforeach()
-  endif()
+  foreach(cpu ${target_cpus})
+    string(REGEX MATCH "-arch compute_([0-9]+)" dont_care "${cpu}")
+    list(APPEND architectures_detected "${CMAKE_MATCH_1}")
+  endforeach()
 endif()
 
 # If the user didn't set the architectures, then set them to a default.
 # If the user did, then make sure those architectures worked.
-if(DEFINED detected_architecture AND "${CMAKE_CUDA_ARCHITECTURES}" STREQUAL "")
-  set(CMAKE_CUDA_ARCHITECTURES "${detected_architecture}" CACHE STRING "CUDA architectures")
+if("${CMAKE_CUDA_ARCHITECTURES}" STREQUAL "")
+  cmake_policy(GET CMP0104 _CUDA_CMP0104)
 
-  if(NOT CMAKE_CUDA_ARCHITECTURES)
-    message(FATAL_ERROR "Failed to find a working CUDA architecture.")
-  endif()
-elseif(architectures)
-  # Sort since order mustn't matter.
-  list(SORT architectures)
-  list(SORT tested_architectures)
+  if(NOT CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA" OR _CUDA_CMP0104 STREQUAL "NEW")
+    set(CMAKE_CUDA_ARCHITECTURES "${architectures_detected}" CACHE STRING "CUDA architectures")
 
-  # We don't distinguish real/virtual architectures during testing.
-  # For "70-real;70-virtual" we detect "70" as working and tested_architectures is "70;70".
-  # Thus we need to remove duplicates before checking if they're equal.
-  list(REMOVE_DUPLICATES tested_architectures)
-
-  if(NOT "${architectures}" STREQUAL "${tested_architectures}")
-    message(FATAL_ERROR
-      "The CMAKE_CUDA_ARCHITECTURES:\n"
-      "  ${CMAKE_CUDA_ARCHITECTURES}\n"
-      "do not all work with this compiler.  Try:\n"
-      "  ${architectures}\n"
-      "instead.")
+    if(NOT CMAKE_CUDA_ARCHITECTURES)
+      message(FATAL_ERROR "Failed to detect a default CUDA architecture.\n\nCompiler output:\n${CMAKE_CUDA_COMPILER_PRODUCED_OUTPUT}")
+    endif()
   endif()
 endif()
 
@@ -614,5 +618,7 @@ unset(_CUDA_LIBRARY_DIR)
 unset(_CUDA_TARGET_DIR)
 unset(_CUDA_TARGET_NAME)
 
+unset(architectures_detected)
+
 set(CMAKE_CUDA_COMPILER_ENV_VAR "CUDACXX")
 set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCXXCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCXXCompiler.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCXXCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCXXCompiler.cmake
index 556518f4..fd3d028b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCXXCompiler.cmake
@@ -125,11 +125,6 @@ if(NOT CMAKE_CXX_COMPILER_ID_RUN)
   if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_COMPILER_IS_GNUCXX 1)
   endif()
-  if(CMAKE_CXX_PLATFORM_ID MATCHES "MinGW")
-    set(CMAKE_COMPILER_IS_MINGW 1)
-  elseif(CMAKE_CXX_PLATFORM_ID MATCHES "Cygwin")
-    set(CMAKE_COMPILER_IS_CYGWIN 1)
-  endif()
 else()
   if(NOT DEFINED CMAKE_CXX_COMPILER_FRONTEND_VARIANT)
     # Some toolchain files set our internal CMAKE_CXX_COMPILER_ID_RUN
@@ -164,7 +159,7 @@ endif ()
 
 if (NOT _CMAKE_TOOLCHAIN_PREFIX)
 
-  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|QCC")
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU|Clang|QCC|LCC")
     get_filename_component(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME)
     if (COMPILER_BASENAME MATCHES "^(.+-)?(clang\\+\\+|[gc]\\+\\+|clang-cl)(-[0-9]+(\\.[0-9]+)*)?(-[^.]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompileFeatures.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompileFeatures.cmake
similarity index 90%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompileFeatures.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompileFeatures.cmake
index a08e597f..09de7b11 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompileFeatures.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompileFeatures.cmake
@@ -63,6 +63,7 @@ function(cmake_determine_compile_features lang)
     set(CMAKE_CXX17_COMPILE_FEATURES)
     set(CMAKE_CXX20_COMPILE_FEATURES)
     set(CMAKE_CXX23_COMPILE_FEATURES)
+    set(CMAKE_CXX26_COMPILE_FEATURES)
 
     include("${CMAKE_ROOT}/Modules/Internal/FeatureTesting.cmake")
 
@@ -73,6 +74,9 @@ function(cmake_determine_compile_features lang)
       return()
     endif()
 
+    if (CMAKE_CXX23_COMPILE_FEATURES AND CMAKE_CXX26_COMPILE_FEATURES)
+      list(REMOVE_ITEM CMAKE_CXX26_COMPILE_FEATURES ${CMAKE_CXX23_COMPILE_FEATURES})
+    endif()
     if (CMAKE_CXX20_COMPILE_FEATURES AND CMAKE_CXX23_COMPILE_FEATURES)
       list(REMOVE_ITEM CMAKE_CXX23_COMPILE_FEATURES ${CMAKE_CXX20_COMPILE_FEATURES})
     endif()
@@ -97,6 +101,7 @@ function(cmake_determine_compile_features lang)
         ${CMAKE_CXX17_COMPILE_FEATURES}
         ${CMAKE_CXX20_COMPILE_FEATURES}
         ${CMAKE_CXX23_COMPILE_FEATURES}
+        ${CMAKE_CXX26_COMPILE_FEATURES}
       )
     endif()
 
@@ -107,6 +112,7 @@ function(cmake_determine_compile_features lang)
     set(CMAKE_CXX17_COMPILE_FEATURES ${CMAKE_CXX17_COMPILE_FEATURES} PARENT_SCOPE)
     set(CMAKE_CXX20_COMPILE_FEATURES ${CMAKE_CXX20_COMPILE_FEATURES} PARENT_SCOPE)
     set(CMAKE_CXX23_COMPILE_FEATURES ${CMAKE_CXX23_COMPILE_FEATURES} PARENT_SCOPE)
+    set(CMAKE_CXX26_COMPILE_FEATURES ${CMAKE_CXX26_COMPILE_FEATURES} PARENT_SCOPE)
 
     message(CHECK_PASS "done")
 
@@ -119,6 +125,7 @@ function(cmake_determine_compile_features lang)
     set(CMAKE_CUDA17_COMPILE_FEATURES)
     set(CMAKE_CUDA20_COMPILE_FEATURES)
     set(CMAKE_CUDA23_COMPILE_FEATURES)
+    set(CMAKE_CUDA26_COMPILE_FEATURES)
 
     include("${CMAKE_ROOT}/Modules/Internal/FeatureTesting.cmake")
 
@@ -129,6 +136,9 @@ function(cmake_determine_compile_features lang)
       return()
     endif()
 
+    if (CMAKE_CUDA23_COMPILE_FEATURES AND CMAKE_CUDA26_COMPILE_FEATURES)
+      list(REMOVE_ITEM CMAKE_CUDA26_COMPILE_FEATURES ${CMAKE_CUDA23_COMPILE_FEATURES})
+    endif()
     if (CMAKE_CUDA20_COMPILE_FEATURES AND CMAKE_CUDA23_COMPILE_FEATURES)
       list(REMOVE_ITEM CMAKE_CUDA23_COMPILE_FEATURES ${CMAKE_CUDA20_COMPILE_FEATURES})
     endif()
@@ -153,6 +163,7 @@ function(cmake_determine_compile_features lang)
         ${CMAKE_CUDA17_COMPILE_FEATURES}
         ${CMAKE_CUDA20_COMPILE_FEATURES}
         ${CMAKE_CUDA23_COMPILE_FEATURES}
+        ${CMAKE_CUDA26_COMPILE_FEATURES}
       )
     endif()
 
@@ -163,6 +174,7 @@ function(cmake_determine_compile_features lang)
     set(CMAKE_CUDA17_COMPILE_FEATURES ${CMAKE_CUDA17_COMPILE_FEATURES} PARENT_SCOPE)
     set(CMAKE_CUDA20_COMPILE_FEATURES ${CMAKE_CUDA20_COMPILE_FEATURES} PARENT_SCOPE)
     set(CMAKE_CUDA23_COMPILE_FEATURES ${CMAKE_CUDA23_COMPILE_FEATURES} PARENT_SCOPE)
+    set(CMAKE_CUDA26_COMPILE_FEATURES ${CMAKE_CUDA26_COMPILE_FEATURES} PARENT_SCOPE)
 
     message(CHECK_PASS "done")
 
@@ -175,6 +187,8 @@ function(cmake_determine_compile_features lang)
     set(CMAKE_HIP17_COMPILE_FEATURES)
     set(CMAKE_HIP20_COMPILE_FEATURES)
     set(CMAKE_HIP23_COMPILE_FEATURES)
+    set(CMAKE_HIP26_COMPILE_FEATURES)
+
 
     include("${CMAKE_ROOT}/Modules/Internal/FeatureTesting.cmake")
 
@@ -185,6 +199,9 @@ function(cmake_determine_compile_features lang)
       return()
     endif()
 
+    if (CMAKE_HIP23_COMPILE_FEATURES AND CMAKE_HIP26_COMPILE_FEATURES)
+      list(REMOVE_ITEM CMAKE_HIP26_COMPILE_FEATURES ${CMAKE_HIP23_COMPILE_FEATURES})
+    endif()
     if (CMAKE_HIP20_COMPILE_FEATURES AND CMAKE_HIP23_COMPILE_FEATURES)
       list(REMOVE_ITEM CMAKE_HIP23_COMPILE_FEATURES ${CMAKE_HIP20_COMPILE_FEATURES})
     endif()
@@ -209,6 +226,7 @@ function(cmake_determine_compile_features lang)
         ${CMAKE_HIP17_COMPILE_FEATURES}
         ${CMAKE_HIP20_COMPILE_FEATURES}
         ${CMAKE_HIP23_COMPILE_FEATURES}
+        ${CMAKE_HIP26_COMPILE_FEATURES}
       )
     endif()
 
@@ -219,6 +237,7 @@ function(cmake_determine_compile_features lang)
     set(CMAKE_HIP17_COMPILE_FEATURES ${CMAKE_HIP17_COMPILE_FEATURES} PARENT_SCOPE)
     set(CMAKE_HIP20_COMPILE_FEATURES ${CMAKE_HIP20_COMPILE_FEATURES} PARENT_SCOPE)
     set(CMAKE_HIP23_COMPILE_FEATURES ${CMAKE_HIP23_COMPILE_FEATURES} PARENT_SCOPE)
+    set(CMAKE_HIP26_COMPILE_FEATURES ${CMAKE_HIP26_COMPILE_FEATURES} PARENT_SCOPE)
 
     message(CHECK_PASS "done")
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompiler.cmake
similarity index 86%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompiler.cmake
index 6430793b..3156ca90 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompiler.cmake
@@ -32,7 +32,7 @@ macro(_cmake_find_compiler lang)
   endif()
 
   # Look for directories containing compilers of reference languages.
-  set(_${lang}_COMPILER_HINTS)
+  set(_${lang}_COMPILER_HINTS "${CMAKE_${lang}_COMPILER_HINTS}")
   foreach(l ${_languages})
     if(CMAKE_${l}_COMPILER AND IS_ABSOLUTE "${CMAKE_${l}_COMPILER}")
       get_filename_component(_hint "${CMAKE_${l}_COMPILER}" PATH)
@@ -53,10 +53,9 @@ macro(_cmake_find_compiler lang)
       NO_DEFAULT_PATH
       DOC "${lang} compiler")
   endif()
-  if(CMAKE_HOST_WIN32 AND CMAKE_GENERATOR MATCHES "Ninja")
-    # On Windows command-line builds, the Makefile generators each imply
-    # a preferred compiler tool.  The Ninja generator does not imply a
-    # compiler tool, so use the compiler that occurs first in PATH.
+  if(CMAKE_HOST_WIN32 AND CMAKE_GENERATOR MATCHES "Ninja|MSYS Makefiles|MinGW Makefiles")
+    # On Windows command-line builds, some generators imply a preferred compiler tool.
+    # These generators do not, so use the compiler that occurs first in PATH.
     find_program(CMAKE_${lang}_COMPILER
       NAMES ${CMAKE_${lang}_COMPILER_LIST}
       NAMES_PER_DIR
@@ -119,9 +118,15 @@ macro(_cmake_find_compiler_path lang)
     # (e.g. via ctest) or set in CMAKE_TOOLCHAIN_FILE
     # if CMAKE_${lang}_COMPILER is a list, use the first item as
     # CMAKE_${lang}_COMPILER and the rest as CMAKE_${lang}_COMPILER_ARG1
-    set(CMAKE_${lang}_COMPILER_ARG1 "${CMAKE_${lang}_COMPILER}")
-    list(POP_FRONT CMAKE_${lang}_COMPILER_ARG1 CMAKE_${lang}_COMPILER)
-    list(JOIN CMAKE_${lang}_COMPILER_ARG1 " " CMAKE_${lang}_COMPILER_ARG1)
+    # Otherwise, preserve any existing CMAKE_${lang}_COMPILER_ARG1 that might
+    # have been saved by CMakeDetermine${lang}Compiler in a previous run.
+    list(LENGTH CMAKE_${lang}_COMPILER _CMAKE_${lang}_COMPILER_LENGTH)
+    if(_CMAKE_${lang}_COMPILER_LENGTH GREATER 1)
+      set(CMAKE_${lang}_COMPILER_ARG1 "${CMAKE_${lang}_COMPILER}")
+      list(POP_FRONT CMAKE_${lang}_COMPILER_ARG1 CMAKE_${lang}_COMPILER)
+      list(JOIN CMAKE_${lang}_COMPILER_ARG1 " " CMAKE_${lang}_COMPILER_ARG1)
+    endif()
+    unset(_CMAKE_${lang}_COMPILER_LENGTH)
 
     # find the compiler in the PATH if necessary
     # if compiler (and arguments) comes from cache then synchronize cache with updated CMAKE_<LANG>_COMPILER
@@ -148,7 +153,7 @@ macro(_cmake_find_compiler_path lang)
 endmacro()
 
 function(_cmake_find_compiler_sysroot lang)
-  if(CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
+  if(CMAKE_${lang}_COMPILER_ID STREQUAL "GNU" OR CMAKE_${lang}_COMPILER_ID STREQUAL "LCC")
     execute_process(COMMAND "${CMAKE_${lang}_COMPILER}" -print-sysroot
       OUTPUT_STRIP_TRAILING_WHITESPACE
       OUTPUT_VARIABLE _cmake_sysroot_run_out
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompilerABI.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompilerABI.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompilerABI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompilerABI.cmake
index 8191d819..053effa2 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompilerABI.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompilerABI.cmake
@@ -26,6 +26,14 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
     if(DEFINED CMAKE_${lang}_VERBOSE_COMPILE_FLAG)
       set(COMPILE_DEFINITIONS "${CMAKE_${lang}_VERBOSE_COMPILE_FLAG}")
     endif()
+    if(lang STREQUAL "CUDA")
+      if(CMAKE_CUDA_ARCHITECTURES STREQUAL "native")
+        # We are about to detect the native architectures, so we do
+        # not yet know them.  Use all architectures during detection.
+        set(CMAKE_CUDA_ARCHITECTURES "all")
+      endif()
+      set(CMAKE_CUDA_RUNTIME_LIBRARY "Static")
+    endif()
     if(NOT "x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xMSVC")
       # Avoid adding our own platform standard libraries for compilers
       # from which we might detect implicit link libraries.
@@ -47,7 +55,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
     set(ENV{LANG}        C)
 
     try_compile(CMAKE_${lang}_ABI_COMPILED
-      ${CMAKE_BINARY_DIR} ${src}
+      SOURCES ${src}
       CMAKE_FLAGS ${CMAKE_FLAGS}
                   # Ignore unused flags when we are just determining the ABI.
                   "--no-warn-unused-cli"
@@ -141,7 +149,8 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
       if(CMAKE_${lang}_VERBOSE_FLAG)
         CMAKE_PARSE_IMPLICIT_LINK_INFO("${OUTPUT}" implicit_libs implicit_dirs implicit_fwks log
           "${CMAKE_${lang}_IMPLICIT_OBJECT_REGEX}"
-          COMPUTE_IMPLICIT_OBJECTS implicit_objs)
+          COMPUTE_IMPLICIT_OBJECTS implicit_objs
+          LANGUAGE ${lang})
         file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
           "Parsed ${lang} implicit link information from above output:\n${log}\n\n")
       endif()
@@ -153,8 +162,9 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src)
         message(CHECK_START "Determine Intel Fortran Compiler Implicit Link Path")
         # Build a sample project which reports symbols.
         try_compile(IFORT_LIB_PATH_COMPILED
-          ${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath
-          ${CMAKE_ROOT}/Modules/IntelVSImplicitPath
+          PROJECT IntelFortranImplicit
+          SOURCE_DIR ${CMAKE_ROOT}/Modules/IntelVSImplicitPath
+          BINARY_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/IntelVSImplicitPath
           IntelFortranImplicit
           CMAKE_FLAGS
           "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompilerId.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompilerId.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompilerId.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompilerId.cmake
index ea59a7f1..73c775ae 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineCompilerId.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineCompilerId.cmake
@@ -150,42 +150,28 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
     endif()
   endif()
 
-  # When invoked with HIPCC we need to extract the path to the underlying
-  # clang compiler when possible. This fixes the following issues:
-  #   env variables can change how hipcc behaves
-  #   allows us to properly find the binutils bundled with hip
-  if(CMAKE_${lang}_COMPILER_ID STREQUAL "ROCMClang"
-     AND CMAKE_${lang}_COMPILER MATCHES ".*hipcc")
-    get_filename_component(_hipcc_dir "${CMAKE_${lang}_COMPILER}" DIRECTORY)
+  # For LCC Fortran we need to explicitly query the version.
+  if(lang STREQUAL "Fortran"
+     AND CMAKE_${lang}_COMPILER_ID STREQUAL "LCC")
     execute_process(
-      COMMAND "${_hipcc_dir}/hipconfig"
-      --hipclangpath
-      OUTPUT_VARIABLE output
+      COMMAND "${CMAKE_${lang}_COMPILER}"
+      --version
+      OUTPUT_VARIABLE output ERROR_VARIABLE output
       RESULT_VARIABLE result
+      TIMEOUT 10
     )
-    if(result EQUAL 0 AND EXISTS "${output}")
-      if(lang STREQUAL "C")
-        set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE "${output}/clang")
-        set(CMAKE_${lang}_COMPILER "${output}/clang" PARENT_SCOPE)
-      else()
-        set_property(CACHE CMAKE_${lang}_COMPILER PROPERTY VALUE "${output}/clang++")
-        set(CMAKE_${lang}_COMPILER "${output}/clang++" PARENT_SCOPE)
-      endif()
-    endif()
-    if(lang STREQUAL "HIP")
-      execute_process(
-        COMMAND "${_hipcc_dir}/hipconfig"
-        --rocmpath
-        OUTPUT_VARIABLE output
-        RESULT_VARIABLE result
+    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+      "Running the ${lang} compiler: \"${CMAKE_${lang}_COMPILER}\" --version\n"
+      "${output}\n"
       )
-      if(result EQUAL 0)
-        set(_CMAKE_HIP_COMPILER_ROCM_ROOT "${output}" PARENT_SCOPE)
-      endif()
+
+    if(output MATCHES [[\(GCC\) ([0-9]+\.[0-9]+(\.[0-9]+)?) compatible]])
+      set(CMAKE_${lang}_SIMULATE_ID "GNU")
+      set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_MATCH_1}")
     endif()
   endif()
 
-  if (COMPILER_QNXNTO AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
+  if (COMPILER_QNXNTO AND (CMAKE_${lang}_COMPILER_ID STREQUAL "GNU" OR CMAKE_${lang}_COMPILER_ID STREQUAL "LCC"))
     execute_process(
       COMMAND "${CMAKE_${lang}_COMPILER}"
       -V
@@ -302,6 +288,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
   set(CMAKE_${lang}_SIMULATE_ID "${CMAKE_${lang}_SIMULATE_ID}" PARENT_SCOPE)
   set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_${lang}_SIMULATE_VERSION}" PARENT_SCOPE)
   set(CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT "${CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT}" PARENT_SCOPE)
+  set(CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT "${CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT}" PARENT_SCOPE)
   set(CMAKE_${lang}_COMPILER_PRODUCED_OUTPUT "${COMPILER_${lang}_PRODUCED_OUTPUT}" PARENT_SCOPE)
   set(CMAKE_${lang}_COMPILER_PRODUCED_FILES "${COMPILER_${lang}_PRODUCED_FILES}" PARENT_SCOPE)
 endfunction()
@@ -354,15 +341,13 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
       set(id_cl "$(CLToolExe)")
     elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*")
       set(id_cl clang.exe)
-    # Executable names have been chosen according documentation
-    # URL: (https://software.intel.com/content/www/us/en/develop/documentation/get-started-with-dpcpp-compiler/top.html#top_GUID-A9B4C91D-97AC-450D-9742-9D895BC8AEE1)
     elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "Intel")
       if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "DPC\\+\\+ Compiler")
         set(id_cl dpcpp.exe)
-      elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler 2021")
-        set(id_cl icx.exe)
-      elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler")
+      elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler ([8-9]\\.|1[0-9]\\.|XE)")
         set(id_cl icl.exe)
+      elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler")
+        set(id_cl icx.exe)
       endif()
     else()
       set(id_cl cl.exe)
@@ -455,6 +440,15 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
     if(CMAKE_VS_PLATFORM_TOOLSET_VCTARGETS_CUSTOM_DIR)
       set(id_ToolsetVCTargetsDir "<VCTargetsPath>${CMAKE_VS_PLATFORM_TOOLSET_VCTARGETS_CUSTOM_DIR}</VCTargetsPath>")
     endif()
+    if(CMAKE_VS_TARGET_FRAMEWORK_VERSION)
+      set(id_TargetFrameworkVersion "<TargetFrameworkVersion>${CMAKE_VS_TARGET_FRAMEWORK_VERSION}</TargetFrameworkVersion>")
+    endif()
+    if(CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER)
+      set(id_TargetFrameworkIdentifier "<TargetFrameworkIdentifier>${CMAKE_VS_TARGET_FRAMEWORK_IDENTIFIER}</TargetFrameworkIdentifier>")
+    endif()
+    if(CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION)
+      set(id_TargetFrameworkTargetsVersion "<TargetFrameworkTargetsVersion>${CMAKE_VS_TARGET_FRAMEWORK_TARGETS_VERSION}</TargetFrameworkTargetsVersion>")
+    endif()
     set(id_CustomGlobals "")
     foreach(pair IN LISTS CMAKE_VS_GLOBALS)
       if("${pair}" MATCHES "([^=]+)=(.*)$")
@@ -501,11 +495,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
       if(CMAKE_VS_PLATFORM_NAME STREQUAL x64)
         set(cuda_target "<TargetMachinePlatform>64</TargetMachinePlatform>")
       endif()
-      foreach(arch ${CMAKE_CUDA_ARCHITECTURES})
-        string(REGEX MATCH "[0-9]+" arch_name "${arch}")
-        string(APPEND cuda_codegen "compute_${arch_name},sm_${arch_name};")
-      endforeach()
-      set(id_ItemDefinitionGroup_entry "<CudaCompile>${cuda_target}<AdditionalOptions>%(AdditionalOptions)-v</AdditionalOptions><CodeGeneration>${cuda_codegen}</CodeGeneration></CudaCompile>")
+      set(id_ItemDefinitionGroup_entry "<CudaCompile>${cuda_target}<AdditionalOptions>%(AdditionalOptions)-v</AdditionalOptions></CudaCompile>")
       set(id_PostBuildEvent_Command [[echo CMAKE_CUDA_COMPILER=$(CudaToolkitBinDir)\nvcc.exe]])
       if(CMAKE_VS_PLATFORM_TOOLSET_CUDA_CUSTOM_DIR)
         # check for legacy cuda custom toolkit folder structure
@@ -573,7 +563,8 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
     else()
       set(id_toolset "")
     endif()
-    if("${lang}" STREQUAL "Swift")
+    set(id_lang_version "")
+    if("x${lang}" STREQUAL "xSwift")
       if(CMAKE_Swift_LANGUAGE_VERSION)
         set(id_lang_version "SWIFT_VERSION = ${CMAKE_Swift_LANGUAGE_VERSION};")
       elseif(XCODE_VERSION VERSION_GREATER_EQUAL 10.2)
@@ -583,8 +574,14 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
       else()
         set(id_lang_version "SWIFT_VERSION = 2.3;")
       endif()
-    else()
-      set(id_lang_version "")
+    elseif("x${lang}" STREQUAL "xC" OR "x${lang}" STREQUAL "xOBJC")
+      if(CMAKE_${lang}_COMPILER_ID_FLAGS MATCHES "(^| )(-std=[^ ]+)( |$)")
+        set(id_lang_version "OTHER_CFLAGS = \"${CMAKE_MATCH_2}\";")
+      endif()
+    elseif("x${lang}" STREQUAL "xCXX" OR "x${lang}" STREQUAL "xOBJCXX")
+      if(CMAKE_${lang}_COMPILER_ID_FLAGS MATCHES "(^| )(-std=[^ ]+)( |$)")
+        set(id_lang_version "OTHER_CPLUSPLUSFLAGS = \"${CMAKE_MATCH_2}\";")
+      endif()
     endif()
     if(CMAKE_OSX_DEPLOYMENT_TARGET)
       set(id_deployment_target
@@ -661,12 +658,8 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
   elseif("${CMAKE_GENERATOR}" MATCHES "Green Hills MULTI")
     set(id_dir ${CMAKE_${lang}_COMPILER_ID_DIR})
     set(id_src "${src}")
-    if (GHS_PRIMARY_TARGET)
-      set(ghs_primary_target "${GHS_PRIMARY_TARGET}")
-    else()
-      set(ghs_primary_target "${CMAKE_GENERATOR_PLATFORM}_${GHS_TARGET_PLATFORM}.tgt")
-    endif()
-    if ("${GHS_TARGET_PLATFORM}" MATCHES "integrity")
+    set(ghs_primary_target "${GHS_PRIMARY_TARGET}")
+    if ("${ghs_primary_target}" MATCHES "integrity")
         set(bsp_name "macro GHS_BSP=${GHS_BSP_NAME}")
         set(os_dir "macro GHS_OS=${GHS_OS_DIR}")
     endif()
@@ -724,10 +717,10 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
   # Check the result of compilation.
   if(CMAKE_${lang}_COMPILER_ID_RESULT
      # Intel Fortran warns and ignores preprocessor lines without /fpp
-     OR CMAKE_${lang}_COMPILER_ID_OUTPUT MATCHES "Bad # preprocessor line"
+     OR CMAKE_${lang}_COMPILER_ID_OUTPUT MATCHES "warning #5117: Bad # preprocessor line"
      )
     # Compilation failed.
-    set(MSG
+    string(APPEND _CMAKE_DETERMINE_COMPILER_ID_BUILD_MSG
       "Compiling the ${lang} compiler identification source file \"${src}\" failed.
 ${COMPILER_DESCRIPTION}
 The output was:
@@ -735,12 +728,19 @@ ${CMAKE_${lang}_COMPILER_ID_RESULT}
 ${CMAKE_${lang}_COMPILER_ID_OUTPUT}
 
 ")
-    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "${MSG}")
+    # Log the output unless we recognize it as a known-bad case.
+    if(NOT CMAKE_${lang}_COMPILER_ID_OUTPUT MATCHES "warning #5117: Bad # preprocessor line")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log "${MSG}")
+    endif()
 
     # Some languages may know the correct/desired set of flags and want to fail right away if they don't work.
     # This is currently only used by CUDA.
     if(__compiler_id_require_success)
-      message(FATAL_ERROR "${MSG}")
+      message(FATAL_ERROR "${_CMAKE_DETERMINE_COMPILER_ID_BUILD_MSG}")
+    else()
+      # Build up the outputs for compiler detection attempts so that users
+      # can see all set of flags tried, instead of just last
+      set(_CMAKE_DETERMINE_COMPILER_ID_BUILD_MSG "${_CMAKE_DETERMINE_COMPILER_ID_BUILD_MSG}" PARENT_SCOPE)
     endif()
 
     # No output files should be inspected.
@@ -841,15 +841,24 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
     set(ARCHITECTURE_ID)
     set(SIMULATE_ID)
     set(SIMULATE_VERSION)
+    set(CMAKE_${lang}_COMPILER_ID_STRING_REGEX ".?I.?N.?F.?O.?:.?[A-Za-z0-9_]+\\[[^]]*\\]")
     foreach(encoding "" "ENCODING;UTF-16LE" "ENCODING;UTF-16BE")
       file(STRINGS "${file}" CMAKE_${lang}_COMPILER_ID_STRINGS
         LIMIT_COUNT 38 ${encoding}
-        REGEX ".?I.?N.?F.?O.?:.?[A-Za-z0-9_]+\\[[^]]*\\]")
+        REGEX "${CMAKE_${lang}_COMPILER_ID_STRING_REGEX}")
       if(NOT CMAKE_${lang}_COMPILER_ID_STRINGS STREQUAL "")
         break()
       endif()
     endforeach()
 
+    # Some ADSP processors result in characters being detected as separate strings
+    if(CMAKE_${lang}_COMPILER_ID_STRINGS STREQUAL "")
+      file(STRINGS "${file}" CMAKE_${lang}_COMPILER_ID_STRINGS LENGTH_MAXIMUM 1)
+      string(REGEX REPLACE ";" "" CMAKE_${lang}_COMPILER_ID_STRING "${CMAKE_${lang}_COMPILER_ID_STRINGS}")
+      string(REGEX MATCHALL "${CMAKE_${lang}_COMPILER_ID_STRING_REGEX}"
+        CMAKE_${lang}_COMPILER_ID_STRINGS "${CMAKE_${lang}_COMPILER_ID_STRING}")
+    endif()
+
     # With the IAR Compiler, some strings are found twice, first time as incomplete
     # list like "?<Constant "INFO:compiler[IAR]">".  Remove the incomplete copies.
     list(FILTER CMAKE_${lang}_COMPILER_ID_STRINGS EXCLUDE REGEX "\\?<Constant \\\"")
@@ -915,9 +924,12 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
       if("${info}" MATCHES "INFO:qnxnto\\[\\]")
         set(COMPILER_QNXNTO 1)
       endif()
-      if("${info}" MATCHES "INFO:dialect_default\\[([^]\"]*)\\]")
+      if("${info}" MATCHES "INFO:standard_default\\[([^]\"]*)\\]")
         set(CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT "${CMAKE_MATCH_1}")
       endif()
+      if("${info}" MATCHES "INFO:extensions_default\\[([^]\"]*)\\]")
+        set(CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT "${CMAKE_MATCH_1}")
+      endif()
     endforeach()
 
     # Construct compiler version from components if needed.
@@ -1027,6 +1039,7 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file)
   set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_${lang}_SIMULATE_VERSION}" PARENT_SCOPE)
   set(COMPILER_QNXNTO "${COMPILER_QNXNTO}" PARENT_SCOPE)
   set(CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT "${CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT}" PARENT_SCOPE)
+  set(CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT "${CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT}" PARENT_SCOPE)
 endfunction()
 
 #-----------------------------------------------------------------------------
@@ -1114,7 +1127,7 @@ function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang userflags)
     OUTPUT_VARIABLE out
     ERROR_VARIABLE err
     RESULT_VARIABLE res
-    ENCODING AUTO # cl prints in current code page
+    ENCODING AUTO # cl prints in console output code page
     )
   if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n]*:[^:\n]*:[ \t]*)")
     set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_MATCH_2}" PARENT_SCOPE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineFortranCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineFortranCompiler.cmake
similarity index 90%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineFortranCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineFortranCompiler.cmake
index d7d032c0..087c0f6c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineFortranCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineFortranCompiler.cmake
@@ -44,16 +44,14 @@ else()
     # finally list compilers to try
     if(NOT CMAKE_Fortran_COMPILER_INIT)
       # Known compilers:
-      #  f77/f90/f95: generic compiler names
       #  ftn: Cray fortran compiler wrapper
-      #  g77: GNU Fortran 77 compiler
       #  gfortran: putative GNU Fortran 95+ compiler (in progress)
-      #  fort77: native F77 compiler under HP-UX (and some older Crays)
-      #  frt: Fujitsu F77 compiler
+      #  frt: Fujitsu Fortran compiler
       #  pathf90/pathf95/pathf2003: PathScale Fortran compiler
-      #  pgf77/pgf90/pgf95/pgfortran: Portland Group F77/F90/F95 compilers
+      #  pgfortran: Portland Group Fortran compilers
+      #  nvfortran: NVHPC Fotran compiler
       #  flang: Flang Fortran compiler
-      #  xlf/xlf90/xlf95: IBM (AIX) F77/F90/F95 compilers
+      #  xlf: IBM (AIX) Fortran compiler
       #  lf95: Lahey-Fujitsu F95 compiler
       #  fl32: Microsoft Fortran 77 "PowerStation" compiler
       #  af77: Apogee F77 compiler for Intergraph hardware running CLIX
@@ -61,38 +59,30 @@ else()
       #  fort: Compaq (now HP) Fortran 90/95 compiler for Tru64 and Linux/Alpha
       #  ifx: Intel Fortran LLVM-based compiler
       #  ifort: Intel Classic Fortran compiler
-      #  ifc: Intel Fortran 95 compiler for Linux/x86
-      #  efc: Intel Fortran 95 compiler for IA64
       #  nagfor: NAG Fortran compiler
       #
-      #  The order is 95 or newer compilers first, then 90,
-      #  then 77 or older compilers, gnu is always last in the group,
+      #  GNU is last to be searched,
       #  so if you paid for a compiler it is picked by default.
-      if(CMAKE_HOST_WIN32)
-        set(CMAKE_Fortran_COMPILER_LIST
-          ifort ifx pgf95 pgfortran lf95 fort
-          flang gfortran gfortran-4 g95 f90 pgf90
-          pgf77 g77 f77 nag
-          )
-      else()
-        set(CMAKE_Fortran_COMPILER_LIST
-          ftn
-          ifort ifc ifx efc pgf95 pgfortran lf95 xlf95 fort
-          flang gfortran gfortran-4 g95 f90 pgf90
-          frt pgf77 xlf g77 f77 nag
-          )
-      endif()
+      set(CMAKE_Fortran_COMPILER_LIST
+        ftn
+        ifx ifort nvfortran pgfortran lf95 xlf fort
+        flang lfortran frt nagfor
+        gfortran
+        )
 
       # Vendor-specific compiler names.
-      set(_Fortran_COMPILER_NAMES_GNU       gfortran gfortran-4 g95 g77)
+      set(_Fortran_COMPILER_NAMES_LCC       lfortran gfortran)
+      set(_Fortran_COMPILER_NAMES_GNU       gfortran)
       set(_Fortran_COMPILER_NAMES_Intel     ifort ifc efc ifx)
       set(_Fortran_COMPILER_NAMES_Absoft    af95 af90 af77)
       set(_Fortran_COMPILER_NAMES_PGI       pgf95 pgfortran pgf90 pgf77)
       set(_Fortran_COMPILER_NAMES_Flang     flang)
+      set(_Fortran_COMPILER_NAMES_LLVMFlang flang)
       set(_Fortran_COMPILER_NAMES_PathScale pathf2003 pathf95 pathf90)
       set(_Fortran_COMPILER_NAMES_XL        xlf)
       set(_Fortran_COMPILER_NAMES_VisualAge xlf95 xlf90 xlf)
       set(_Fortran_COMPILER_NAMES_NAG       nagfor)
+      set(_Fortran_COMPILER_NAMES_NVHPC     nvfortran)
     endif()
 
     _cmake_find_compiler(Fortran)
@@ -235,11 +225,6 @@ if(NOT CMAKE_Fortran_COMPILER_ID_RUN)
   if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
     set(CMAKE_COMPILER_IS_GNUG77 1)
   endif()
-  if(CMAKE_Fortran_PLATFORM_ID MATCHES "MinGW")
-    set(CMAKE_COMPILER_IS_MINGW 1)
-  elseif(CMAKE_Fortran_PLATFORM_ID MATCHES "Cygwin")
-    set(CMAKE_COMPILER_IS_CYGWIN 1)
-  endif()
 endif()
 
 if (NOT _CMAKE_TOOLCHAIN_LOCATION)
diff --git a/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineHIPCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineHIPCompiler.cmake
new file mode 100644
index 00000000..6294d047
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineHIPCompiler.cmake
@@ -0,0 +1,189 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+include(${CMAKE_ROOT}/Modules/CMakeDetermineCompiler.cmake)
+include(${CMAKE_ROOT}/Modules/CMakeParseImplicitLinkInfo.cmake)
+
+if( NOT ( ("${CMAKE_GENERATOR}" MATCHES "Make") OR
+          ("${CMAKE_GENERATOR}" MATCHES "Ninja") ) )
+  message(FATAL_ERROR "HIP language not currently supported by \"${CMAKE_GENERATOR}\" generator")
+endif()
+
+
+if(NOT CMAKE_HIP_COMPILER)
+  set(CMAKE_HIP_COMPILER_INIT NOTFOUND)
+
+  # prefer the environment variable HIPCXX
+  if(NOT $ENV{HIPCXX} STREQUAL "")
+    if("$ENV{HIPCXX}" MATCHES "hipcc")
+      message(FATAL_ERROR
+        "The HIPCXX environment variable is set to the hipcc wrapper:\n"
+        " $ENV{HIPCXX}\n"
+        "This is not supported.  Use Clang directly, or let CMake pick a default."
+        )
+    endif()
+    get_filename_component(CMAKE_HIP_COMPILER_INIT $ENV{HIPCXX} PROGRAM PROGRAM_ARGS CMAKE_HIP_FLAGS_ENV_INIT)
+    if(CMAKE_HIP_FLAGS_ENV_INIT)
+      set(CMAKE_HIP_COMPILER_ARG1 "${CMAKE_HIP_FLAGS_ENV_INIT}" CACHE STRING "Arguments to CXX compiler")
+    endif()
+    if(NOT EXISTS ${CMAKE_HIP_COMPILER_INIT})
+      message(FATAL_ERROR "Could not find compiler set in environment variable HIPCXX:\n$ENV{HIPCXX}.\n${CMAKE_HIP_COMPILER_INIT}")
+    endif()
+  endif()
+
+  # finally list compilers to try
+  if(NOT CMAKE_HIP_COMPILER_INIT)
+    set(CMAKE_HIP_COMPILER_LIST clang++)
+
+    # Look for the Clang coming with ROCm to support HIP.
+    execute_process(COMMAND hipconfig --hipclangpath
+      OUTPUT_VARIABLE _CMAKE_HIPCONFIG_CLANGPATH
+      RESULT_VARIABLE _CMAKE_HIPCONFIG_RESULT
+    )
+    if(_CMAKE_HIPCONFIG_RESULT EQUAL 0 AND EXISTS "${_CMAKE_HIPCONFIG_CLANGPATH}")
+      set(CMAKE_HIP_COMPILER_HINTS "${_CMAKE_HIPCONFIG_CLANGPATH}")
+    endif()
+  endif()
+
+  _cmake_find_compiler(HIP)
+elseif(CMAKE_HIP_COMPILER MATCHES "hipcc")
+  message(FATAL_ERROR
+    "CMAKE_HIP_COMPILER is set to the hipcc wrapper:\n"
+    " ${CMAKE_HIP_COMPILER}\n"
+    "This is not supported.  Use Clang directly, or let CMake pick a default."
+    )
+else()
+  _cmake_find_compiler_path(HIP)
+endif()
+
+mark_as_advanced(CMAKE_HIP_COMPILER)
+
+# Build a small source file to identify the compiler.
+if(NOT CMAKE_HIP_COMPILER_ID_RUN)
+  set(CMAKE_HIP_COMPILER_ID_RUN 1)
+
+  # Try to identify the compiler.
+  set(CMAKE_HIP_COMPILER_ID)
+  set(CMAKE_HIP_PLATFORM_ID)
+  file(READ ${CMAKE_ROOT}/Modules/CMakePlatformId.h.in
+    CMAKE_HIP_COMPILER_ID_PLATFORM_CONTENT)
+
+  list(APPEND CMAKE_HIP_COMPILER_ID_TEST_FLAGS_FIRST "-v")
+
+  include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)
+  CMAKE_DETERMINE_COMPILER_ID(HIP HIPFLAGS CMakeHIPCompilerId.hip)
+
+  _cmake_find_compiler_sysroot(HIP)
+endif()
+
+if(NOT CMAKE_HIP_COMPILER_ROCM_ROOT AND CMAKE_HIP_COMPILER_ID STREQUAL "Clang")
+   execute_process(COMMAND "${CMAKE_HIP_COMPILER}" -v -print-targets
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE _CMAKE_HIP_COMPILER_RESULT
+    OUTPUT_VARIABLE _CMAKE_HIP_COMPILER_STDOUT
+    ERROR_VARIABLE _CMAKE_HIP_COMPILER_STDERR
+    )
+
+  if(_CMAKE_HIP_COMPILER_RESULT EQUAL 0 AND _CMAKE_HIP_COMPILER_STDERR MATCHES "Found HIP installation: *([^,]*)[,\n]")
+    set(CMAKE_HIP_COMPILER_ROCM_ROOT "${CMAKE_MATCH_1}")
+    file(TO_CMAKE_PATH "${CMAKE_HIP_COMPILER_ROCM_ROOT}" CMAKE_HIP_COMPILER_ROCM_ROOT)
+  endif()
+endif()
+if(NOT CMAKE_HIP_COMPILER_ROCM_ROOT)
+  execute_process(
+    COMMAND hipconfig --rocmpath
+    OUTPUT_VARIABLE _CMAKE_HIPCONFIG_ROCMPATH
+    RESULT_VARIABLE _CMAKE_HIPCONFIG_RESULT
+    )
+  if(_CMAKE_HIPCONFIG_RESULT EQUAL 0 AND EXISTS "${_CMAKE_HIPCONFIG_ROCMPATH}")
+    set(CMAKE_HIP_COMPILER_ROCM_ROOT "${_CMAKE_HIPCONFIG_ROCMPATH}")
+  endif()
+endif()
+if(NOT CMAKE_HIP_COMPILER_ROCM_ROOT)
+  message(FATAL_ERROR "Failed to find ROCm root directory.")
+endif()
+if(NOT EXISTS "${CMAKE_HIP_COMPILER_ROCM_ROOT}/lib/cmake/hip-lang/hip-lang-config.cmake")
+  message(FATAL_ERROR
+    "The ROCm root directory:\n"
+    " ${CMAKE_HIP_COMPILER_ROCM_ROOT}\n"
+    "does not contain the HIP runtime CMake package, expected at:\n"
+    " ${CMAKE_HIP_COMPILER_ROCM_ROOT}/lib/cmake/hip-lang/hip-lang-config.cmake\n"
+    )
+endif()
+
+if (NOT _CMAKE_TOOLCHAIN_LOCATION)
+  get_filename_component(_CMAKE_TOOLCHAIN_LOCATION "${CMAKE_HIP_COMPILER}" PATH)
+endif ()
+
+set(_CMAKE_PROCESSING_LANGUAGE "HIP")
+include(CMakeFindBinUtils)
+include(Compiler/${CMAKE_HIP_COMPILER_ID}-FindBinUtils OPTIONAL)
+unset(_CMAKE_PROCESSING_LANGUAGE)
+
+if(CMAKE_HIP_COMPILER_SYSROOT)
+  string(CONCAT _SET_CMAKE_HIP_COMPILER_SYSROOT
+    "set(CMAKE_HIP_COMPILER_SYSROOT \"${CMAKE_HIP_COMPILER_SYSROOT}\")\n"
+    "set(CMAKE_COMPILER_SYSROOT \"${CMAKE_HIP_COMPILER_SYSROOT}\")")
+else()
+  set(_SET_CMAKE_HIP_COMPILER_SYSROOT "")
+endif()
+
+if(CMAKE_HIP_COMPILER_ARCHITECTURE_ID)
+  set(_SET_CMAKE_HIP_COMPILER_ARCHITECTURE_ID
+    "set(CMAKE_HIP_COMPILER_ARCHITECTURE_ID ${CMAKE_HIP_COMPILER_ARCHITECTURE_ID})")
+else()
+  set(_SET_CMAKE_HIP_COMPILER_ARCHITECTURE_ID "")
+endif()
+
+if(MSVC_HIP_ARCHITECTURE_ID)
+  set(SET_MSVC_HIP_ARCHITECTURE_ID
+    "set(MSVC_HIP_ARCHITECTURE_ID ${MSVC_HIP_ARCHITECTURE_ID})")
+endif()
+
+if(NOT DEFINED CMAKE_HIP_ARCHITECTURES)
+  # Use 'rocm_agent_enumerator' to get the current GPU architecture.
+  set(_CMAKE_HIP_ARCHITECTURES)
+  find_program(_CMAKE_HIP_ROCM_AGENT_ENUMERATOR
+    NAMES rocm_agent_enumerator
+    HINTS "${CMAKE_HIP_COMPILER_ROCM_ROOT}/bin"
+    NO_CACHE)
+  if(_CMAKE_HIP_ROCM_AGENT_ENUMERATOR)
+    execute_process(COMMAND "${_CMAKE_HIP_ROCM_AGENT_ENUMERATOR}" -t GPU
+      RESULT_VARIABLE _CMAKE_ROCM_AGENT_ENUMERATOR_RESULT
+      OUTPUT_VARIABLE _CMAKE_ROCM_AGENT_ENUMERATOR_STDOUT
+      ERROR_VARIABLE  _CMAKE_ROCM_AGENT_ENUMERATOR_STDERR
+    )
+    if(_CMAKE_ROCM_AGENT_ENUMERATOR_RESULT EQUAL 0)
+      separate_arguments(_hip_archs NATIVE_COMMAND "${_CMAKE_ROCM_AGENT_ENUMERATOR_STDOUT}")
+      foreach(_hip_arch ${_hip_archs})
+        if(_hip_arch STREQUAL "gfx000")
+          continue()
+        endif()
+        string(FIND ${_hip_arch} ":" pos)
+        if(NOT pos STREQUAL "-1")
+          string(SUBSTRING ${_hip_arch} 0 ${pos} _hip_arch)
+        endif()
+        list(APPEND _CMAKE_HIP_ARCHITECTURES "${_hip_arch}")
+      endforeach()
+    endif()
+    unset(_CMAKE_ROCM_AGENT_ENUMERATOR_RESULT)
+    unset(_CMAKE_ROCM_AGENT_ENUMERATOR_STDOUT)
+    unset(_CMAKE_ROCM_AGENT_ENUMERATOR_STDERR)
+  endif()
+  unset(_CMAKE_HIP_ROCM_AGENT_ENUMERATOR)
+  if(_CMAKE_HIP_ARCHITECTURES)
+    set(CMAKE_HIP_ARCHITECTURES "${_CMAKE_HIP_ARCHITECTURES}" CACHE STRING "HIP architectures")
+  elseif(CMAKE_HIP_COMPILER_PRODUCED_OUTPUT MATCHES " -target-cpu ([a-z0-9]+) ")
+    set(CMAKE_HIP_ARCHITECTURES "${CMAKE_MATCH_1}" CACHE STRING "HIP architectures")
+  else()
+    message(FATAL_ERROR "Failed to find a default HIP architecture.")
+  endif()
+  unset(_CMAKE_HIP_ARCHITECTURES)
+endif()
+
+# configure variables set in this file for fast reload later on
+configure_file(${CMAKE_ROOT}/Modules/CMakeHIPCompiler.cmake.in
+  ${CMAKE_PLATFORM_INFO_DIR}/CMakeHIPCompiler.cmake
+  @ONLY
+  )
+set(CMAKE_HIP_COMPILER_ENV_VAR "HIPCXX")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineISPCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineISPCCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineISPCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineISPCCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineJavaCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineJavaCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineJavaCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineJavaCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineOBJCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineOBJCCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineOBJCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineOBJCCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineOBJCXXCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineOBJCXXCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineOBJCXXCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineOBJCXXCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineRCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineRCCompiler.cmake
similarity index 77%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineRCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineRCCompiler.cmake
index f8d55a5c..d22741bb 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineRCCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineRCCompiler.cmake
@@ -30,16 +30,19 @@ if(NOT CMAKE_RC_COMPILER)
 
   # finally list compilers to try
   if(CMAKE_RC_COMPILER_INIT)
-    set(CMAKE_RC_COMPILER_LIST ${CMAKE_RC_COMPILER_INIT})
-  else()
-    set(CMAKE_RC_COMPILER_LIST rc)
+    set(_CMAKE_RC_COMPILER_LIST     ${CMAKE_RC_COMPILER_INIT})
+    set(_CMAKE_RC_COMPILER_FALLBACK ${CMAKE_RC_COMPILER_INIT})
+  elseif(NOT _CMAKE_RC_COMPILER_LIST)
+    set(_CMAKE_RC_COMPILER_LIST rc)
   endif()
 
   # Find the compiler.
-  find_program(CMAKE_RC_COMPILER NAMES ${CMAKE_RC_COMPILER_LIST} DOC "RC compiler")
-  if(CMAKE_RC_COMPILER_INIT AND NOT CMAKE_RC_COMPILER)
-    set(CMAKE_RC_COMPILER "${CMAKE_RC_COMPILER_INIT}" CACHE FILEPATH "RC compiler" FORCE)
+  find_program(CMAKE_RC_COMPILER NAMES ${_CMAKE_RC_COMPILER_LIST} DOC "RC compiler")
+  if(_CMAKE_RC_COMPILER_FALLBACK AND NOT CMAKE_RC_COMPILER)
+    set(CMAKE_RC_COMPILER "${_CMAKE_RC_COMPILER_FALLBACK}" CACHE FILEPATH "RC compiler" FORCE)
   endif()
+  unset(_CMAKE_RC_COMPILER_FALLBACK)
+  unset(_CMAKE_RC_COMPILER_LIST)
 endif()
 
 mark_as_advanced(CMAKE_RC_COMPILER)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineSwiftCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineSwiftCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineSwiftCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineSwiftCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineSystem.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineSystem.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineSystem.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineSystem.cmake
index 8c7af067..2c2c2ac3 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineSystem.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineSystem.cmake
@@ -128,7 +128,6 @@ if(CMAKE_TOOLCHAIN_FILE)
     set(CMAKE_TOOLCHAIN_FILE "${_INCLUDED_TOOLCHAIN_FILE}" CACHE FILEPATH "The CMake toolchain file" FORCE)
   else()
     message(FATAL_ERROR "Could not find toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
-    set(CMAKE_TOOLCHAIN_FILE "NOTFOUND" CACHE FILEPATH "The CMake toolchain file" FORCE)
   endif()
 endif()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineVSServicePack.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineVSServicePack.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeDetermineVSServicePack.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeDetermineVSServicePack.cmake
index 53868d21..0d360b53 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeDetermineVSServicePack.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeDetermineVSServicePack.cmake
@@ -105,8 +105,7 @@ function(_DetermineVSServicePack_CheckVersionWithTryCompile _SUCCESS_VAR  _VERSI
 
     try_compile(
       _CompileResult
-      "${CMAKE_BINARY_DIR}"
-      "${CMAKE_BINARY_DIR}/return0.cc"
+      SOURCES "${CMAKE_BINARY_DIR}/return0.cc"
       OUTPUT_VARIABLE _output
       COPY_FILE "${CMAKE_BINARY_DIR}/return0.cc")
 
@@ -128,8 +127,7 @@ function(_DetermineVSServicePack_CheckVersionWithTryRun _SUCCESS_VAR  _VERSION_V
     try_run(
         _RunResult
         _CompileResult
-        "${CMAKE_BINARY_DIR}"
-        "${CMAKE_BINARY_DIR}/return0.cc"
+        SOURCES "${CMAKE_BINARY_DIR}/return0.cc"
         RUN_OUTPUT_VARIABLE  _runoutput
         )
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeExpandImportedTargets.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeExpandImportedTargets.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeExpandImportedTargets.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeExpandImportedTargets.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeExportBuildSettings.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeExportBuildSettings.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeExportBuildSettings.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeExportBuildSettings.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index f90301be..5d7d430a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -88,7 +88,7 @@ set(ENV{LANG}        C)
 
 # Now check for C, works for gcc and Intel compiler at least
 if (NOT CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS)
-  if (CMAKE_C_COMPILER_ID MATCHES GNU  OR  CMAKE_C_COMPILER_ID MATCHES "Intel"  OR  CMAKE_C_COMPILER_ID MATCHES Clang)
+  if (CMAKE_C_COMPILER_ID MATCHES GNU  OR  CMAKE_C_COMPILER_ID MATCHES "LCC"  OR  CMAKE_C_COMPILER_ID MATCHES "Intel"  OR  CMAKE_C_COMPILER_ID MATCHES Clang)
     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c _dirs _defines)
     set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "C compiler system include directories")
     set(CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "C compiler system defined macros")
@@ -99,7 +99,7 @@ endif ()
 
 # And now the same for C++
 if (NOT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS)
-  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel"  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Clang)
+  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES "LCC"  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel"  OR  "${CMAKE_CXX_COMPILER_ID}" MATCHES Clang)
     _DETERMINE_GCC_SYSTEM_INCLUDE_DIRS(c++ _dirs _defines)
     set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS "${_dirs}" CACHE INTERNAL "CXX compiler system include directories")
     set(CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS "${_defines}" CACHE INTERNAL "CXX compiler system defined macros")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindBinUtils.cmake
similarity index 86%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindBinUtils.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindBinUtils.cmake
index f139ff48..2ac88799 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeFindBinUtils.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFindBinUtils.cmake
@@ -20,6 +20,9 @@
 
 # on UNIX, cygwin and mingw
 
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
 # Resolve full path of CMAKE_TOOL from user-defined name and SEARCH_PATH.
 function(__resolve_tool_path CMAKE_TOOL SEARCH_PATH DOCSTRING)
 
@@ -33,7 +36,7 @@ function(__resolve_tool_path CMAKE_TOOL SEARCH_PATH DOCSTRING)
     if(NOT _CMAKE_USER_TOOL_PATH)
 
       # Find CMAKE_TOOL in the SEARCH_PATH directory by user-defined name.
-      find_program(_CMAKE_TOOL_WITH_PATH NAMES ${${CMAKE_TOOL}} HINTS ${SEARCH_PATH})
+      find_program(_CMAKE_TOOL_WITH_PATH NAMES ${${CMAKE_TOOL}} HINTS ${SEARCH_PATH} NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
       if(_CMAKE_TOOL_WITH_PATH)
 
         # Overwrite CMAKE_TOOL with full path found in SEARCH_PATH.
@@ -79,10 +82,11 @@ if(("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC" AND
   if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xClang")
     set(_CMAKE_NM_NAMES "llvm-nm" "nm")
     list(PREPEND _CMAKE_AR_NAMES "llvm-lib")
-    list(PREPEND _CMAKE_MT_NAMES "llvm-mt")
+    # llvm-mt does not support all flags we need in vs_link_exe
+    # list(PREPEND _CMAKE_MT_NAMES "llvm-mt")
     list(PREPEND _CMAKE_LINKER_NAMES "lld-link")
     list(APPEND _CMAKE_TOOL_VARS NM)
-  elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" MATCHES "^xIntel")
+  elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xIntel")
     list(PREPEND _CMAKE_AR_NAMES "xilib")
     list(PREPEND _CMAKE_LINKER_NAMES "xilink")
   endif()
@@ -114,7 +118,7 @@ elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" MATCHES "^xIAR$")
   endfunction()
 
   __resolve_IAR_hints("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER}" _CMAKE_TOOLCHAIN_LOCATION)
-  set(_CMAKE_IAR_ITOOLS "ARM" "RX" "RH850" "RL78" "RISCV" "STM8")
+  set(_CMAKE_IAR_ITOOLS "ARM" "RX" "RH850" "RL78" "RISCV" "RISC-V" "STM8")
   set(_CMAKE_IAR_XTOOLS "AVR" "MSP430" "V850" "8051")
 
   if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ARCHITECTURE_ID}" IN_LIST _CMAKE_IAR_ITOOLS)
@@ -165,13 +169,24 @@ else()
   # Prepend toolchain-specific names.
   if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL Clang)
     if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC")
-      set(_CMAKE_LINKER_NAMES "lld-link")
-    else()
-      set(_CMAKE_LINKER_NAMES "ld.lld")
+      list(PREPEND _CMAKE_LINKER_NAMES "lld-link")
+    elseif(NOT APPLE)
+      list(PREPEND _CMAKE_LINKER_NAMES "ld.lld")
+    endif()
+    if(APPLE)
+      # llvm-ar does not generate a symbol table that the Apple ld64 linker accepts.
+      # FIXME(#23333): We still need to consider 'llvm-ar' as a fallback because
+      # the 'APPLE' definition may be based on the host in this context, and a
+      # cross-compiling toolchain may not have 'ar'.
+      list(APPEND _CMAKE_AR_NAMES "llvm-ar")
+    else()
+      list(PREPEND _CMAKE_AR_NAMES "llvm-ar")
     endif()
-    list(PREPEND _CMAKE_AR_NAMES "llvm-ar")
     list(PREPEND _CMAKE_RANLIB_NAMES "llvm-ranlib")
-    list(PREPEND _CMAKE_STRIP_NAMES "llvm-strip")
+    if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}" VERSION_GREATER_EQUAL 11)
+      # llvm-strip versions prior to 11 require additional flags we do not yet add.
+      list(PREPEND _CMAKE_STRIP_NAMES "llvm-strip")
+    endif()
     list(PREPEND _CMAKE_NM_NAMES "llvm-nm")
     if("${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}" VERSION_GREATER_EQUAL 9)
       # llvm-objdump versions prior to 9 did not support everything we need.
@@ -202,7 +217,7 @@ foreach(_CMAKE_TOOL IN LISTS _CMAKE_TOOL_VARS)
   endforeach()
   list(REMOVE_DUPLICATES _CMAKE_${_CMAKE_TOOL}_FIND_NAMES)
 
-  find_program(CMAKE_${_CMAKE_TOOL} NAMES ${_CMAKE_${_CMAKE_TOOL}_FIND_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+  find_program(CMAKE_${_CMAKE_TOOL} NAMES ${_CMAKE_${_CMAKE_TOOL}_FIND_NAMES} HINTS ${_CMAKE_TOOLCHAIN_LOCATION} NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
   unset(_CMAKE_${_CMAKE_TOOL}_FIND_NAMES)
 endforeach()
 
@@ -212,7 +227,7 @@ endif()
 
 
 if(CMAKE_PLATFORM_HAS_INSTALLNAME)
-  find_program(CMAKE_INSTALL_NAME_TOOL NAMES ${_CMAKE_TOOLCHAIN_PREFIX}install_name_tool HINTS ${_CMAKE_TOOLCHAIN_LOCATION})
+  find_program(CMAKE_INSTALL_NAME_TOOL NAMES ${_CMAKE_TOOLCHAIN_PREFIX}install_name_tool HINTS ${_CMAKE_TOOLCHAIN_LOCATION} NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
 
   if(NOT CMAKE_INSTALL_NAME_TOOL)
     message(FATAL_ERROR "Could not find install_name_tool, please check your installation.")
@@ -240,3 +255,5 @@ if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" MATCHES "^xIAR$")
   set(CMAKE_IAR_LINKER "${CMAKE_LINKER}" CACHE FILEPATH "The IAR ILINK linker")
   mark_as_advanced(CMAKE_IAR_LINKER CMAKE_IAR_AR)
 endif()
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindCodeBlocks.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindCodeBlocks.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindCodeBlocks.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindCodeBlocks.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindDependencyMacro.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindDependencyMacro.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindDependencyMacro.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindDependencyMacro.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindEclipseCDT4.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindEclipseCDT4.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindEclipseCDT4.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindEclipseCDT4.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindFrameworks.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindFrameworks.cmake
similarity index 83%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindFrameworks.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindFrameworks.cmake
index 8906f48f..1aa39294 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeFindFrameworks.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFindFrameworks.cmake
@@ -17,12 +17,19 @@ if(NOT CMAKE_FIND_FRAMEWORKS_INCLUDED)
   macro(CMAKE_FIND_FRAMEWORKS fwk)
     set(${fwk}_FRAMEWORKS)
     if(APPLE)
+      # 'Frameworks' directory from Brew (Apple Silicon and Intel)
+      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+        set(_brew_framework_path /opt/homebrew/Frameworks)
+      else()
+        set(_brew_framework_path /usr/local/Frameworks)
+      endif()
+
       file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _cmff_CMAKE_FRAMEWORK_PATH)
       set(_cmff_search_paths
             ${CMAKE_FRAMEWORK_PATH}
             ${_cmff_CMAKE_FRAMEWORK_PATH}
             ~/Library/Frameworks
-            /usr/local/Frameworks
+            ${_brew_framework_path}
             /Library/Frameworks
             /System/Library/Frameworks
             /Network/Library/Frameworks
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindJavaCommon.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindJavaCommon.cmake
similarity index 89%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindJavaCommon.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindJavaCommon.cmake
index 46b6280b..c6e33488 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeFindJavaCommon.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFindJavaCommon.cmake
@@ -19,7 +19,10 @@ else()
     set(_CMD_JAVA_HOME "")
     if(APPLE AND EXISTS /usr/libexec/java_home)
       execute_process(COMMAND /usr/libexec/java_home
-        OUTPUT_VARIABLE _CMD_JAVA_HOME OUTPUT_STRIP_TRAILING_WHITESPACE)
+        OUTPUT_VARIABLE _CMD_JAVA_HOME
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+      )
     endif()
     if(_CMD_JAVA_HOME AND IS_DIRECTORY "${_CMD_JAVA_HOME}")
       set(_JAVA_HOME "${_CMD_JAVA_HOME}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindKate.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindKate.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindKate.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindKate.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindPackageMode.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindPackageMode.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindPackageMode.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindPackageMode.cmake
index 815dfc90..726e2a29 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeFindPackageMode.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFindPackageMode.cmake
@@ -78,7 +78,7 @@ if(UNIX)
   # from the outside
   if(NOT CMAKE_SIZEOF_VOID_P)
     set(CMAKE_SIZEOF_VOID_P 4)
-    if(EXISTS /usr/lib64)
+    if(EXISTS ${CMAKE_SYSROOT}/usr/lib64)
       set(CMAKE_SIZEOF_VOID_P 8)
     else()
       # use the file utility to check whether itself is 64 bit:
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindSublimeText2.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindSublimeText2.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindSublimeText2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindSublimeText2.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindWMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindWMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindWMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindWMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFindXCode.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFindXCode.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFindXCode.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFindXCode.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeForceCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeForceCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeForceCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeForceCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompiler.cmake.in
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompiler.cmake.in
index 06ee5286..97f891e1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompiler.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompiler.cmake.in
@@ -5,6 +5,7 @@ set(CMAKE_Fortran_COMPILER_VERSION "@CMAKE_Fortran_COMPILER_VERSION@")
 set(CMAKE_Fortran_COMPILER_WRAPPER "@CMAKE_Fortran_COMPILER_WRAPPER@")
 set(CMAKE_Fortran_PLATFORM_ID "@CMAKE_Fortran_PLATFORM_ID@")
 set(CMAKE_Fortran_SIMULATE_ID "@CMAKE_Fortran_SIMULATE_ID@")
+set(CMAKE_Fortran_COMPILER_FRONTEND_VARIANT "@CMAKE_Fortran_COMPILER_FRONTEND_VARIANT@")
 set(CMAKE_Fortran_SIMULATE_VERSION "@CMAKE_Fortran_SIMULATE_VERSION@")
 @_SET_CMAKE_Fortran_XL_CPP@
 @_SET_CMAKE_Fortran_COMPILER_ARCHITECTURE_ID@
@@ -18,20 +19,11 @@ set(CMAKE_COMPILER_IS_GNUG77 @CMAKE_COMPILER_IS_GNUG77@)
 set(CMAKE_Fortran_COMPILER_LOADED 1)
 set(CMAKE_Fortran_COMPILER_WORKS @CMAKE_Fortran_COMPILER_WORKS@)
 set(CMAKE_Fortran_ABI_COMPILED @CMAKE_Fortran_ABI_COMPILED@)
-set(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
-set(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
-if(CMAKE_COMPILER_IS_CYGWIN)
-  set(CYGWIN 1)
-  set(UNIX 1)
-endif()
 
 set(CMAKE_Fortran_COMPILER_ENV_VAR "FC")
 
 set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 @CMAKE_Fortran_COMPILER_SUPPORTS_F90@)
 
-if(CMAKE_COMPILER_IS_MINGW)
-  set(MINGW 1)
-endif()
 set(CMAKE_Fortran_COMPILER_ID_RUN 1)
 set(CMAKE_Fortran_SOURCE_FILE_EXTENSIONS f;F;fpp;FPP;f77;F77;f90;F90;for;For;FOR;f95;F95)
 set(CMAKE_Fortran_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompilerABI.F b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerABI.F
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompilerABI.F
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerABI.F
diff --git a/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerABI.F90 b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerABI.F90
new file mode 100644
index 00000000..4a171533
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerABI.F90
@@ -0,0 +1,48 @@
+program CMakeFortranCompilerABI
+
+implicit none
+
+integer :: i(1) = 0
+where (i==0) i=1
+if (any(i/=1)) stop 1
+! showing Fortran 90 syntax is OK
+
+#if 0
+! Address Size
+#endif
+#if defined(_LP64)
+PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(_M_IA64)
+PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(_M_X64)
+PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(_M_AMD64)
+PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(__x86_64__)
+PRINT *, 'INFO:sizeof_dptr[8]'
+
+#elif defined(_ILP32)
+PRINT *, 'INFO:sizeof_dptr[4]'
+#elif defined(_M_IX86)
+PRINT *, 'INFO:sizeof_dptr[4]'
+#elif defined(__i386__)
+PRINT *, 'INFO:sizeof_dptr[4]'
+
+#elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 8
+PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 4
+PRINT *, 'INFO:sizeof_dptr[4]'
+#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 8
+PRINT *, 'INFO:sizeof_dptr[8]'
+#elif defined(__SIZEOF_SIZE_T__) && __SIZEOF_SIZE_T__ == 4
+PRINT *, 'INFO:sizeof_dptr[4]'
+#endif
+
+#if 0
+! Application Binary Interface
+#endif
+#if defined(__ELF__)
+PRINT *, 'INFO:abi[ELF]'
+#endif
+PRINT *, 'ABI Detection'
+end program
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompilerId.F.in b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerId.F.in
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompilerId.F.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerId.F.in
index d0e0e46f..f5c2ab55 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeFortranCompilerId.F.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranCompilerId.F.in
@@ -95,6 +95,13 @@
 # endif
 #elif defined(__ABSOFT__)
         PRINT *, 'INFO:compiler[Absoft]'
+#elif defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__))
+        PRINT *, 'INFO:compiler[LCC]'
+# define COMPILER_VERSION_MAJOR DEC(1)
+# define COMPILER_VERSION_MINOR DEC(__LCC__ - 100)
+# if defined(__LCC_MINOR__)
+#  define COMPILER_VERSION_PATCH DEC(__LCC_MINOR__)
+# endif
 #elif defined(__GNUC__)
         PRINT *, 'INFO:compiler[GNU]'
 # define COMPILER_VERSION_MAJOR DEC(__GNUC__)
@@ -147,6 +154,13 @@
 # if defined(__FLANG_PATCHLEVEL__)
 #  define COMPILER_VERSION_PATCH DEC(__FLANG_PATCHLEVEL__)
 # endif
+#elif defined(__flang__)
+        PRINT *, 'INFO:compiler[LLVMFlang]'
+# define COMPILER_VERSION_MAJOR DEC(__flang_major__)
+# define COMPILER_VERSION_MINOR DEC(__flang_minor__)
+# if defined(__flang_patchlevel__)
+#  define COMPILER_VERSION_PATCH DEC(__flang_patchlevel__)
+# endif
 #elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__)
         PRINT *, 'INFO:compiler[VisualAge]'
 #elif defined(__hpux) || defined(__hpux__)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeFortranInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranInformation.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeFortranInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeFortranInformation.cmake
index 9a4ce635..0f71c6f0 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeFortranInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeFortranInformation.cmake
@@ -157,6 +157,15 @@ if(NOT CMAKE_INCLUDE_FLAG_Fortran)
   set(CMAKE_INCLUDE_FLAG_Fortran ${CMAKE_INCLUDE_FLAG_C})
 endif()
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_Fortran_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_Fortran_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
+
 set(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
 
 set(CMAKE_Fortran_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Fortran_FLAGS_INIT}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeGenericSystem.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeGenericSystem.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeGenericSystem.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeGenericSystem.cmake
index 649b6f7c..e2925dc9 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeGenericSystem.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeGenericSystem.cmake
@@ -24,6 +24,12 @@ set(CMAKE_DL_LIBS "dl")
 set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a")
 
+# Define feature "DEFAULT" as supported. This special feature generates the
+# default option to link a library
+# This feature is intended to be used in LINK_LIBRARY_OVERRIDE and
+# LINK_LIBRARY_OVERRIDE_<LIBRARY> target properties
+set(CMAKE_LINK_LIBRARY_USING_DEFAULT_SUPPORTED TRUE)
+
 set(CMAKE_AUTOGEN_ORIGIN_DEPENDS ON)
 set(CMAKE_AUTOMOC_COMPILER_PREDEFINES ON)
 if(NOT DEFINED CMAKE_AUTOMOC_PATH_PREFIX)
@@ -41,11 +47,16 @@ set (CMAKE_SKIP_INSTALL_RPATH "NO" CACHE BOOL
 
 set(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
 
+if(DEFINED ENV{CMAKE_COLOR_DIAGNOSTICS} AND NOT DEFINED CACHE{CMAKE_COLOR_DIAGNOSTICS})
+  set(CMAKE_COLOR_DIAGNOSTICS $ENV{CMAKE_COLOR_DIAGNOSTICS} CACHE BOOL "Enable colored diagnostics throughout.")
+endif()
+
 if(CMAKE_GENERATOR MATCHES "Make")
-  set(CMAKE_COLOR_MAKEFILE ON CACHE BOOL
-    "Enable/Disable color output during build."
-    )
+  if(NOT DEFINED CMAKE_COLOR_DIAGNOSTICS)
+    set(CMAKE_COLOR_MAKEFILE ON CACHE BOOL "Enable/Disable color output during build.")
+  endif()
   mark_as_advanced(CMAKE_COLOR_MAKEFILE)
+
   if(DEFINED CMAKE_RULE_MESSAGES)
     set_property(GLOBAL PROPERTY RULE_MESSAGES ${CMAKE_RULE_MESSAGES})
   endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeGraphVizOptions.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeGraphVizOptions.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeGraphVizOptions.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeGraphVizOptions.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompiler.cmake.in
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompiler.cmake.in
index 9a30a45b..ce4e2cf6 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompiler.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompiler.cmake.in
@@ -2,6 +2,7 @@ set(CMAKE_HIP_COMPILER "@CMAKE_HIP_COMPILER@")
 set(CMAKE_HIP_COMPILER_ID "@CMAKE_HIP_COMPILER_ID@")
 set(CMAKE_HIP_COMPILER_VERSION "@CMAKE_HIP_COMPILER_VERSION@")
 set(CMAKE_HIP_STANDARD_COMPUTED_DEFAULT "@CMAKE_HIP_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_HIP_EXTENSIONS_COMPUTED_DEFAULT "@CMAKE_HIP_EXTENSIONS_COMPUTED_DEFAULT@")
 set(CMAKE_HIP_COMPILE_FEATURES "@CMAKE_HIP_COMPILE_FEATURES@")
 set(CMAKE_HIP98_COMPILE_FEATURES "@CMAKE_HIP03_COMPILE_FEATURES@")
 set(CMAKE_HIP11_COMPILE_FEATURES "@CMAKE_HIP11_COMPILE_FEATURES@")
@@ -16,6 +17,7 @@ set(CMAKE_HIP_COMPILER_FRONTEND_VARIANT "@CMAKE_HIP_COMPILER_FRONTEND_VARIANT@")
 set(CMAKE_HIP_SIMULATE_VERSION "@CMAKE_HIP_SIMULATE_VERSION@")
 @SET_MSVC_HIP_ARCHITECTURE_ID@
 @_SET_CMAKE_HIP_COMPILER_SYSROOT@
+set(CMAKE_HIP_COMPILER_ROCM_ROOT "@CMAKE_HIP_COMPILER_ROCM_ROOT@")
 
 set(CMAKE_HIP_COMPILER_ENV_VAR "HIPCXX")
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompilerABI.hip b/deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompilerABI.hip
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompilerABI.hip
rename to deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompilerABI.hip
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompilerId.hip.in b/deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompilerId.hip.in
similarity index 77%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompilerId.hip.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompilerId.hip.in
index 5258efba..3c4a1d4b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPCompilerId.hip.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeHIPCompilerId.hip.in
@@ -16,7 +16,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
 @CMAKE_HIP_COMPILER_ID_PLATFORM_CONTENT@
 @CMAKE_HIP_COMPILER_ID_ERROR_FOR_TEST@
 
-const char* info_language_dialect_default = "INFO" ":" "dialect_default["
+const char* info_language_standard_default = "INFO" ":" "standard_default["
 #if __cplusplus > 202002L
   "23"
 #elif __cplusplus > 201703L
@@ -32,6 +32,14 @@ const char* info_language_dialect_default = "INFO" ":" "dialect_default["
 #endif
 "]";
 
+const char* info_language_extensions_default = "INFO" ":" "extensions_default["
+#if (defined(__clang__) || defined(__GNUC__)) && !defined(__STRICT_ANSI__)
+  "ON"
+#else
+  "OFF"
+#endif
+"]";
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -48,7 +56,8 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
-  require += info_language_dialect_default[argc];
+  require += info_language_standard_default[argc];
+  require += info_language_extensions_default[argc];
   (void)argv;
   return require;
 }
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeHIPInformation.cmake
similarity index 87%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeHIPInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeHIPInformation.cmake
index ec37e1c9..33f8697e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeHIPInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeHIPInformation.cmake
@@ -68,6 +68,15 @@ if(NOT CMAKE_MODULE_EXISTS)
   set(CMAKE_SHARED_MODULE_CREATE_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_HIP_FLAGS})
 endif()
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_HIP_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_HIP_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
+
 # add the flags to the cache based
 # on the initial values computed in the platform/*.cmake files
 # use _INIT variables so that this only happens the first time
@@ -132,8 +141,11 @@ endif()
 set(CMAKE_HIP_INFORMATION_LOADED 1)
 
 # Load the file and find the relevant HIP runtime.
-# This file will only exist after all compiler detection has finished
-include(${CMAKE_PLATFORM_INFO_DIR}/CMakeHIPRuntime.cmake OPTIONAL)
-if(COMMAND _CMAKE_FIND_HIP_RUNTIME)
-  _CMAKE_FIND_HIP_RUNTIME()
+if(NOT DEFINED _CMAKE_HIP_DEVICE_RUNTIME_TARGET)
+  set(hip-lang_DIR "${CMAKE_HIP_COMPILER_ROCM_ROOT}/lib/cmake/hip-lang")
+  find_package(hip-lang CONFIG QUIET NO_DEFAULT_PATH REQUIRED)
+endif()
+if(DEFINED _CMAKE_HIP_DEVICE_RUNTIME_TARGET)
+  list(APPEND CMAKE_HIP_RUNTIME_LIBRARIES_STATIC ${_CMAKE_HIP_DEVICE_RUNTIME_TARGET})
+  list(APPEND CMAKE_HIP_RUNTIME_LIBRARIES_SHARED ${_CMAKE_HIP_DEVICE_RUNTIME_TARGET})
 endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeIOSInstallCombined.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeIOSInstallCombined.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeIOSInstallCombined.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeIOSInstallCombined.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeISPCCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeISPCCompiler.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeISPCCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeISPCCompiler.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeISPCCompilerABI.ispc b/deps/cmake/share/cmake-3.25/Modules/CMakeISPCCompilerABI.ispc
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeISPCCompilerABI.ispc
rename to deps/cmake/share/cmake-3.25/Modules/CMakeISPCCompilerABI.ispc
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeISPCCompilerId.ispc.in b/deps/cmake/share/cmake-3.25/Modules/CMakeISPCCompilerId.ispc.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeISPCCompilerId.ispc.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeISPCCompilerId.ispc.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeISPCInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeISPCInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeISPCInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeISPCInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeImportBuildSettings.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeImportBuildSettings.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeImportBuildSettings.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeImportBuildSettings.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeInitializeConfigs.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeInitializeConfigs.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeInitializeConfigs.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeInitializeConfigs.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeJOMFindMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeJOMFindMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeJOMFindMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeJOMFindMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeJavaCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeJavaCompiler.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeJavaCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeJavaCompiler.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeJavaInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeJavaInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeJavaInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeJavaInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeLanguageInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeLanguageInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeLanguageInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeLanguageInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeMSYSFindMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeMSYSFindMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeMSYSFindMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeMSYSFindMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeMinGWFindMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeMinGWFindMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeMinGWFindMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeMinGWFindMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeNMakeFindMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeNMakeFindMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeNMakeFindMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeNMakeFindMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeNinjaFindMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeNinjaFindMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeNinjaFindMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeNinjaFindMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompiler.cmake.in
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompiler.cmake.in
index ab67bf39..36f6ec15 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompiler.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompiler.cmake.in
@@ -5,6 +5,7 @@ set(CMAKE_OBJC_COMPILER_VERSION "@CMAKE_OBJC_COMPILER_VERSION@")
 set(CMAKE_OBJC_COMPILER_VERSION_INTERNAL "@CMAKE_OBJC_COMPILER_VERSION_INTERNAL@")
 set(CMAKE_OBJC_COMPILER_WRAPPER "@CMAKE_OBJC_COMPILER_WRAPPER@")
 set(CMAKE_OBJC_STANDARD_COMPUTED_DEFAULT "@CMAKE_OBJC_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_OBJC_EXTENSIONS_COMPUTED_DEFAULT "@CMAKE_OBJC_EXTENSIONS_COMPUTED_DEFAULT@")
 set(CMAKE_OBJC_COMPILE_FEATURES "@CMAKE_OBJC_COMPILE_FEATURES@")
 set(CMAKE_OBJC90_COMPILE_FEATURES "@CMAKE_OBJC90_COMPILE_FEATURES@")
 set(CMAKE_OBJC99_COMPILE_FEATURES "@CMAKE_OBJC99_COMPILE_FEATURES@")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompilerABI.m b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompilerABI.m
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompilerABI.m
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompilerABI.m
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompilerId.m.in b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompilerId.m.in
similarity index 73%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompilerId.m.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompilerId.m.in
index 418fd485..89bfe02e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCCompilerId.m.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCCompilerId.m.in
@@ -23,23 +23,31 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
 #if !defined(__STDC__)
 # if (defined(_MSC_VER) && !defined(__clang__)) \
   || (defined(__ibmxl__) || defined(__IBMC__))
-#  define C_DIALECT "90"
+#  define C_VERSION "90"
 # else
-#  define C_DIALECT
+#  define C_VERSION
 # endif
 #elif __STDC_VERSION__ > 201710L
-# define C_DIALECT "23"
+# define C_VERSION "23"
 #elif __STDC_VERSION__ >= 201710L
-# define C_DIALECT "17"
+# define C_VERSION "17"
 #elif __STDC_VERSION__ >= 201000L
-# define C_DIALECT "11"
+# define C_VERSION "11"
 #elif __STDC_VERSION__ >= 199901L
-# define C_DIALECT "99"
+# define C_VERSION "99"
 #else
-# define C_DIALECT "90"
+# define C_VERSION "90"
 #endif
-const char* info_language_dialect_default =
-  "INFO" ":" "dialect_default[" C_DIALECT "]";
+const char* info_language_standard_default =
+  "INFO" ":" "standard_default[" C_VERSION "]";
+
+const char* info_language_extensions_default = "INFO" ":" "extensions_default["
+#if (defined(__clang__) || defined(__GNUC__)) && !defined(__STRICT_ANSI__)
+  "ON"
+#else
+  "OFF"
+#endif
+"]";
 
 /*--------------------------------------------------------------------------*/
 
@@ -61,7 +69,8 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
-  require += info_language_dialect_default[argc];
+  require += info_language_standard_default[argc];
+  require += info_language_extensions_default[argc];
   (void)argv;
   return require;
 }
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCInformation.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCInformation.cmake
index ac67d013..4c697da3 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCInformation.cmake
@@ -91,6 +91,15 @@ if(CMAKE_USER_MAKE_RULES_OVERRIDE_OBJC)
   set(CMAKE_USER_MAKE_RULES_OVERRIDE_OBJC "${_override}")
 endif()
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_OBJC_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_OBJC_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
+
 
 # for most systems a module is the same as a shared library
 # so unless the variable CMAKE_MODULE_EXISTS is set just
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompiler.cmake.in
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompiler.cmake.in
index a24582b8..4f271003 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompiler.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompiler.cmake.in
@@ -5,6 +5,7 @@ set(CMAKE_OBJCXX_COMPILER_VERSION "@CMAKE_OBJCXX_COMPILER_VERSION@")
 set(CMAKE_OBJCXX_COMPILER_VERSION_INTERNAL "@CMAKE_OBJCXX_COMPILER_VERSION_INTERNAL@")
 set(CMAKE_OBJCXX_COMPILER_WRAPPER "@CMAKE_OBJCXX_COMPILER_WRAPPER@")
 set(CMAKE_OBJCXX_STANDARD_COMPUTED_DEFAULT "@CMAKE_OBJCXX_STANDARD_COMPUTED_DEFAULT@")
+set(CMAKE_OBJCXX_EXTENSIONS_COMPUTED_DEFAULT "@CMAKE_OBJCXX_EXTENSIONS_COMPUTED_DEFAULT@")
 set(CMAKE_OBJCXX_COMPILE_FEATURES "@CMAKE_OBJCXX_COMPILE_FEATURES@")
 set(CMAKE_OBJCXX98_COMPILE_FEATURES "@CMAKE_OBJCXX98_COMPILE_FEATURES@")
 set(CMAKE_OBJCXX11_COMPILE_FEATURES "@CMAKE_OBJCXX11_COMPILE_FEATURES@")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompilerABI.mm b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompilerABI.mm
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompilerABI.mm
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompilerABI.mm
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompilerId.mm.in b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompilerId.mm.in
similarity index 82%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompilerId.mm.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompilerId.mm.in
index e2ac35d0..2145b404 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXCompilerId.mm.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXCompilerId.mm.in
@@ -29,7 +29,7 @@ char const* qnxnto = "INFO" ":" "qnxnto[]";
 #define CXX_STD __cplusplus
 #endif
 
-const char* info_language_dialect_default = "INFO" ":" "dialect_default["
+const char* info_language_standard_default = "INFO" ":" "standard_default["
 #if CXX_STD > 202002L
   "23"
 #elfif CXX_STD > 201703L
@@ -45,6 +45,14 @@ const char* info_language_dialect_default = "INFO" ":" "dialect_default["
 #endif
 "]";
 
+const char* info_language_extensions_default = "INFO" ":" "extensions_default["
+#if (defined(__clang__) || defined(__GNUC__)) && !defined(__STRICT_ANSI__)
+  "ON"
+#else
+  "OFF"
+#endif
+"]";
+
 /*--------------------------------------------------------------------------*/
 
 int main(int argc, char* argv[])
@@ -64,7 +72,8 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
-  require += info_language_dialect_default[argc];
+  require += info_language_standard_default[argc];
+  require += info_language_extensions_default[argc];
   (void)argv;
   return require;
 }
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXInformation.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXInformation.cmake
index 70e8579a..a6d824f1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeOBJCXXInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeOBJCXXInformation.cmake
@@ -189,6 +189,15 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   endif()
 endforeach()
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_OBJCXX_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_OBJCXX_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
+
 # add the flags to the cache based
 # on the initial values computed in the platform/*.cmake files
 # use _INIT variables so that this only happens the first time
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakePackageConfigHelpers.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakePackageConfigHelpers.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/CMakePackageConfigHelpers.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakePackageConfigHelpers.cmake
index 5813956e..6f5702ae 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakePackageConfigHelpers.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakePackageConfigHelpers.cmake
@@ -177,9 +177,9 @@ macro.
   packages with no binaries.
 
 .. versionadded:: 3.19
-  ``COMPATIBILITY_MODE`` ``AnyNewerVersion``, ``SameMajorVersion`` and
-  ``SameMinorVersion`` handle the version range if any is specified
-  (see :command:`find_package` command for the details).
+  The version file generated by ``AnyNewerVersion``, ``SameMajorVersion`` and
+  ``SameMinorVersion`` arguments of ``COMPATIBILITY`` handle the version range
+  if any is specified (see :command:`find_package` command for the details).
   ``ExactVersion`` mode is incompatible with version ranges and will display an
   author warning if one is specified.
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeParseArguments.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeParseArguments.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeParseArguments.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeParseArguments.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeParseImplicitIncludeInfo.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeParseImplicitIncludeInfo.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeParseImplicitIncludeInfo.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeParseImplicitIncludeInfo.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeParseImplicitLinkInfo.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeParseImplicitLinkInfo.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeParseImplicitLinkInfo.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeParseImplicitLinkInfo.cmake
index a61f71b1..1773dc4f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -22,7 +22,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
   set(log "")
 
   set(keywordArgs)
-  set(oneValueArgs COMPUTE_IMPLICIT_OBJECTS)
+  set(oneValueArgs COMPUTE_IMPLICIT_OBJECTS LANGUAGE)
   set(multiValueArgs )
   cmake_parse_arguments(EXTRA_PARSE "${keywordArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -58,6 +58,10 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
       endif()
       separate_arguments(args NATIVE_COMMAND "${line}")
       list(GET args 0 cmd)
+      if("${cmd}" MATCHES "->")
+        # LCC has '-> ' in-front of the linker
+        list(GET args 1 cmd)
+      endif()
     else()
       #check to see if the link line is comma-separated instead of space separated
       string(REGEX REPLACE "," " " line "${line}")
@@ -72,6 +76,11 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
       endif()
     endif()
     set(is_msvc 0)
+    if(EXTRA_PARSE_LANGUAGE AND
+      ("x${CMAKE_${EXTRA_PARSE_LANGUAGE}_ID}" STREQUAL "xMSVC" OR
+       "x${CMAKE_${EXTRA_PARSE_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC"))
+      set(is_msvc 1)
+    endif()
     set(search_static 0)
     if("${cmd}" MATCHES "${linker_regex}")
       string(APPEND log "  link line: [${line}]\n")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeParseLibraryArchitecture.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeParseLibraryArchitecture.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeParseLibraryArchitecture.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeParseLibraryArchitecture.cmake
index 6fb9c6bf..f7a4b29c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeParseLibraryArchitecture.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeParseLibraryArchitecture.cmake
@@ -23,7 +23,7 @@ function(cmake_parse_library_architecture lang implicit_dirs implicit_objs outpu
 
     foreach(obj IN LISTS implicit_objs)
       get_filename_component(dir "${obj}" DIRECTORY)
-      if("${dir}" MATCHES "(/usr)+/lib/${CMAKE_LIBRARY_ARCHITECTURE_REGEX}$")
+      if("${dir}" MATCHES "(/usr)?/lib/${CMAKE_LIBRARY_ARCHITECTURE_REGEX}$")
         get_filename_component(arch "${dir}" NAME)
         set(library_arch "${arch}")
         break()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakePlatformId.h.in b/deps/cmake/share/cmake-3.25/Modules/CMakePlatformId.h.in
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/CMakePlatformId.h.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakePlatformId.h.in
index 59195f8e..32b71663 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakePlatformId.h.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakePlatformId.h.in
@@ -105,6 +105,9 @@
 #  define PLATFORM_ID "Integrity"
 # endif
 
+# elif defined(_ADI_COMPILER)
+#  define PLATFORM_ID "ADSP"
+
 #else /* unknown platform */
 # define PLATFORM_ID
 
@@ -233,6 +236,36 @@
 #  define ARCHITECTURE_ID ""
 # endif
 
+# elif defined(__ADSPSHARC__)
+#  define ARCHITECTURE_ID "SHARC"
+
+# elif defined(__ADSPBLACKFIN__)
+#  define ARCHITECTURE_ID "Blackfin"
+
+#elif defined(__TASKING__)
+
+# if defined(__CTC__) || defined(__CPTC__)
+#  define ARCHITECTURE_ID "TriCore"
+
+# elif defined(__CMCS__)
+#  define ARCHITECTURE_ID "MCS"
+
+# elif defined(__CARM__)
+#  define ARCHITECTURE_ID "ARM"
+
+# elif defined(__CARC__)
+#  define ARCHITECTURE_ID "ARC"
+
+# elif defined(__C51__)
+#  define ARCHITECTURE_ID "8051"
+
+# elif defined(__CPCP__)
+#  define ARCHITECTURE_ID "PCP"
+
+# else
+#  define ARCHITECTURE_ID ""
+# endif
+
 #else
 #  define ARCHITECTURE_ID
 #endif
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakePrintHelpers.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakePrintHelpers.cmake
similarity index 58%
rename from deps/cmake/share/cmake-3.21/Modules/CMakePrintHelpers.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakePrintHelpers.cmake
index 8c25a737..fb201dc2 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakePrintHelpers.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakePrintHelpers.cmake
@@ -10,16 +10,19 @@ e.g. for debugging.
 
 ::
 
-  cmake_print_properties([TARGETS target1 ..  targetN]
-                        [SOURCES source1 .. sourceN]
-                        [DIRECTORIES dir1 .. dirN]
-                        [TESTS test1 .. testN]
-                        [CACHE_ENTRIES entry1 .. entryN]
-                        PROPERTIES prop1 .. propN )
+  cmake_print_properties(<TARGETS       [<target1> ...] |
+                          SOURCES       [<source1> ...] |
+                          DIRECTORIES   [<dir1> ...]    |
+                          TESTS         [<test1> ...]   |
+                          CACHE_ENTRIES [<entry1> ...]  >
+                         PROPERTIES [<prop1> ...]         )
 
 This function prints the values of the properties of the given targets,
 source files, directories, tests or cache entries.  Exactly one of the
-scope keywords must be used.  Example::
+scope keywords must be used.  The scope keyword and its arguments must
+come before the ``PROPERTIES`` keyword, in the arguments list.
+
+Example::
 
   cmake_print_properties(TARGETS foo bar PROPERTIES
                          LOCATION INTERFACE_INCLUDE_DIRECTORIES)
@@ -56,17 +59,34 @@ endfunction()
 function(cmake_print_properties)
   set(options )
   set(oneValueArgs )
-  set(multiValueArgs TARGETS SOURCES TESTS DIRECTORIES CACHE_ENTRIES PROPERTIES )
+  set(cpp_multiValueArgs PROPERTIES )
+  set(cppmode_multiValueArgs TARGETS SOURCES TESTS DIRECTORIES CACHE_ENTRIES )
 
-  cmake_parse_arguments(CPP "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${ARGN})
+  string(JOIN " " _mode_names ${cppmode_multiValueArgs})
+  set(_missing_mode_message
+    "Mode keyword missing in cmake_print_properties() call, there must be exactly one of ${_mode_names}")
 
-  if(CPP_UNPARSED_ARGUMENTS)
-    message(FATAL_ERROR "Unknown keywords given to cmake_print_properties(): \"${CPP_UNPARSED_ARGUMENTS}\"")
+  cmake_parse_arguments(
+    CPP "${options}" "${oneValueArgs}" "${cpp_multiValueArgs}" ${ARGN})
+
+  if(NOT CPP_PROPERTIES)
+    message(FATAL_ERROR
+      "Required argument PROPERTIES missing in cmake_print_properties() call")
     return()
   endif()
 
-  if(NOT CPP_PROPERTIES)
-    message(FATAL_ERROR "Required argument PROPERTIES missing in cmake_print_properties() call")
+  if(NOT CPP_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR "${_missing_mode_message}")
+    return()
+  endif()
+
+  cmake_parse_arguments(
+    CPPMODE "${options}" "${oneValueArgs}" "${cppmode_multiValueArgs}"
+    ${CPP_UNPARSED_ARGUMENTS})
+
+  if(CPPMODE_UNPARSED_ARGUMENTS)
+    message(FATAL_ERROR
+      "Unknown keywords given to cmake_print_properties(): \"${CPPMODE_UNPARSED_ARGUMENTS}\"")
     return()
   endif()
 
@@ -74,32 +94,32 @@ function(cmake_print_properties)
   set(items)
   set(keyword)
 
-  if(CPP_TARGETS)
-    set(items ${CPP_TARGETS})
+  if(CPPMODE_TARGETS)
+    set(items ${CPPMODE_TARGETS})
     set(mode ${mode} TARGETS)
     set(keyword TARGET)
   endif()
 
-  if(CPP_SOURCES)
-    set(items ${CPP_SOURCES})
+  if(CPPMODE_SOURCES)
+    set(items ${CPPMODE_SOURCES})
     set(mode ${mode} SOURCES)
     set(keyword SOURCE)
   endif()
 
-  if(CPP_TESTS)
-    set(items ${CPP_TESTS})
+  if(CPPMODE_TESTS)
+    set(items ${CPPMODE_TESTS})
     set(mode ${mode} TESTS)
     set(keyword TEST)
   endif()
 
-  if(CPP_DIRECTORIES)
-    set(items ${CPP_DIRECTORIES})
+  if(CPPMODE_DIRECTORIES)
+    set(items ${CPPMODE_DIRECTORIES})
     set(mode ${mode} DIRECTORIES)
     set(keyword DIRECTORY)
   endif()
 
-  if(CPP_CACHE_ENTRIES)
-    set(items ${CPP_CACHE_ENTRIES})
+  if(CPPMODE_CACHE_ENTRIES)
+    set(items ${CPPMODE_CACHE_ENTRIES})
     set(mode ${mode} CACHE_ENTRIES)
     # This is a workaround for the fact that passing `CACHE` as an argument to
     # set() causes a cache variable to be set.
@@ -108,13 +128,14 @@ function(cmake_print_properties)
   endif()
 
   if(NOT mode)
-    message(FATAL_ERROR "Mode keyword missing in cmake_print_properties() call, must be one of TARGETS SOURCES TESTS DIRECTORIES CACHE_ENTRIES PROPERTIES")
+    message(FATAL_ERROR "${_missing_mode_message}")
     return()
   endif()
 
   list(LENGTH mode modeLength)
   if("${modeLength}" GREATER 1)
-    message(FATAL_ERROR "Multiple mode keyword used in cmake_print_properties() call, it must be exactly one of TARGETS SOURCES TESTS DIRECTORIES CACHE_ENTRIES PROPERTIES")
+    message(FATAL_ERROR
+      "Multiple mode keywords used in cmake_print_properties() call, there must be exactly one of ${_mode_names}.")
     return()
   endif()
 
@@ -124,8 +145,8 @@ function(cmake_print_properties)
     set(itemExists TRUE)
     if(keyword STREQUAL "TARGET")
       if(NOT TARGET ${item})
-      set(itemExists FALSE)
-      string(APPEND msg "\n No such TARGET \"${item}\" !\n\n")
+        set(itemExists FALSE)
+        string(APPEND msg "\n No such TARGET \"${item}\" !\n\n")
       endif()
     endif()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakePrintSystemInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakePrintSystemInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakePrintSystemInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakePrintSystemInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakePushCheckState.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakePushCheckState.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakePushCheckState.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakePushCheckState.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeRCCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeRCCompiler.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeRCCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeRCCompiler.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeRCInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeRCInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeRCInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeRCInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeSwiftCompiler.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeSwiftCompiler.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeSwiftCompiler.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeSwiftCompiler.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeSwiftInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeSwiftInformation.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeSwiftInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeSwiftInformation.cmake
index 8f0909c9..16726d2d 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeSwiftInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeSwiftInformation.cmake
@@ -65,11 +65,20 @@ set(CMAKE_Swift_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL -libc MD)
 set(CMAKE_Swift_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug -libc MTd)
 set(CMAKE_Swift_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL -libc MDd)
 
-set(CMAKE_Swift_FLAGS_DEBUG_INIT "-g")
+set(CMAKE_Swift_FLAGS_DEBUG_INIT "-Onone -g")
 set(CMAKE_Swift_FLAGS_RELEASE_INIT "-O")
 set(CMAKE_Swift_FLAGS_RELWITHDEBINFO_INIT "-O -g")
 set(CMAKE_Swift_FLAGS_MINSIZEREL_INIT "-Osize")
 
+if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+  if(NOT DEFINED CMAKE_Swift_LINK_WHAT_YOU_USE_FLAG)
+    set(CMAKE_Swift_LINK_WHAT_YOU_USE_FLAG "LINKER:--no-as-needed")
+  endif()
+  if(NOT DEFINED CMAKE_LINK_WHAT_YOU_USE_CHECK)
+    set(CMAKE_LINK_WHAT_YOU_USE_CHECK ldd -u -r)
+  endif()
+endif()
+
 cmake_initialize_per_config_variable(CMAKE_Swift_FLAGS "Swift Compiler Flags")
 
 # NOTE(compnerd) we do not have an object compile rule since we build the objects as part of the link step
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeSystem.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CMakeSystem.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeSystem.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CMakeSystem.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeSystemSpecificInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeSystemSpecificInformation.cmake
similarity index 77%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeSystemSpecificInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeSystemSpecificInformation.cmake
index 0ded5688..b5dc8d3e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeSystemSpecificInformation.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeSystemSpecificInformation.cmake
@@ -16,7 +16,25 @@ set(UNIX   )
 set(CYGWIN )
 set(MSYS )
 set(WIN32  )
+set(BSD )
+set(LINUX )
 
+function(_cmake_record_install_prefix )
+  set(_CMAKE_SYSTEM_PREFIX_PATH_INSTALL_PREFIX_VALUE "${CMAKE_INSTALL_PREFIX}" PARENT_SCOPE)
+  set(_CMAKE_SYSTEM_PREFIX_PATH_STAGING_PREFIX_VALUE "${CMAKE_STAGING_PREFIX}" PARENT_SCOPE)
+  set(icount 0)
+  set(scount 0)
+  foreach(value IN LISTS CMAKE_SYSTEM_PREFIX_PATH)
+    if(value STREQUAL CMAKE_INSTALL_PREFIX)
+      math(EXPR icount "${icount}+1")
+    endif()
+    if(value STREQUAL CMAKE_STAGING_PREFIX)
+      math(EXPR scount "${scount}+1")
+    endif()
+  endforeach()
+  set(_CMAKE_SYSTEM_PREFIX_PATH_INSTALL_PREFIX_COUNT "${icount}" PARENT_SCOPE)
+  set(_CMAKE_SYSTEM_PREFIX_PATH_STAGING_PREFIX_COUNT "${scount}" PARENT_SCOPE)
+endfunction()
 
 # include Generic system information
 include(CMakeGenericSystem)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeSystemSpecificInitialize.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeSystemSpecificInitialize.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeSystemSpecificInitialize.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeSystemSpecificInitialize.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestASM-ATTCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestASM-ATTCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestASM-ATTCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestASM-ATTCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestASMCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestASMCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestASMCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestASMCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestASM_MASMCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestASM_MASMCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestASM_MASMCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestASM_MASMCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestASM_NASMCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestASM_NASMCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestASM_NASMCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestASM_NASMCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCCompiler.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestCCompiler.cmake
index ae5aa27a..a7067675 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCCompiler.cmake
@@ -38,7 +38,7 @@ endif()
 if(NOT CMAKE_C_COMPILER_WORKS)
   PrintTestCompilerStatus("C")
   __TestCompiler_setTryCompileTargetType()
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler.c
+  string(CONCAT __TestCompiler_testCCompilerSource
     "#ifdef __cplusplus\n"
     "# error \"The CMAKE_C_COMPILER is set to a C++ compiler\"\n"
     "#endif\n"
@@ -53,9 +53,10 @@ if(NOT CMAKE_C_COMPILER_WORKS)
   # Clear result from normal variable.
   unset(CMAKE_C_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_C_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler.c
+  try_compile(CMAKE_C_COMPILER_WORKS
+    SOURCE_FROM_VAR testCCompiler.c __TestCompiler_testCCompilerSource
     OUTPUT_VARIABLE __CMAKE_C_COMPILER_OUTPUT)
+  unset(__TestCompiler_testCCompilerSource)
   # Move result from cache to normal variable.
   set(CMAKE_C_COMPILER_WORKS ${CMAKE_C_COMPILER_WORKS})
   unset(CMAKE_C_COMPILER_WORKS CACHE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCSharpCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCSharpCompiler.cmake
similarity index 87%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestCSharpCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestCSharpCompiler.cmake
index adea250f..1c9e2493 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCSharpCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCSharpCompiler.cmake
@@ -12,8 +12,6 @@ include(CMakeTestCompilerCommon)
 
 unset(CMAKE_CSharp_COMPILER_WORKS CACHE)
 
-set(test_compile_file "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCSharpCompiler.cs")
-
 # This file is used by EnableLanguage in cmGlobalGenerator to
 # determine that the selected C# compiler can actually compile
 # and link the most basic of programs. If not, a fatal error
@@ -23,19 +21,21 @@ if(NOT CMAKE_CSharp_COMPILER_WORKS)
   # Don't call PrintTestCompilerStatus() because the "C#" we want to pass
   # as the LANG doesn't match with the variable name "CMAKE_CSharp_COMPILER"
   message(CHECK_START "Check for working C# compiler: ${CMAKE_CSharp_COMPILER}")
-  file(WRITE "${test_compile_file}"
-    "namespace Test {"
-    "   public class CSharp {"
-    "       static void Main(string[] args) {}"
-    "   }"
-    "}"
+  string(CONCAT __TestCompiler_testCSharpCompilerSource
+    "namespace Test {\n"
+    "   public class CSharp {\n"
+    "       static void Main(string[] args) {}\n"
+    "   }\n"
+    "}\n"
     )
   # Clear result from normal variable.
   unset(CMAKE_CSharp_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_CSharp_COMPILER_WORKS ${CMAKE_BINARY_DIR} "${test_compile_file}"
+  try_compile(CMAKE_CSharp_COMPILER_WORKS
+    SOURCE_FROM_VAR testCSharpCompiler.cs __TestCompiler_testCSharpCompilerSource
     OUTPUT_VARIABLE __CMAKE_CSharp_COMPILER_OUTPUT
     )
+  unset(__TestCompiler_testCSharpCompilerSource)
   # Move result from cache to normal variable.
   set(CMAKE_CSharp_COMPILER_WORKS ${CMAKE_CSharp_COMPILER_WORKS})
   unset(CMAKE_CSharp_COMPILER_WORKS CACHE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCUDACompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCUDACompiler.cmake
similarity index 66%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestCUDACompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestCUDACompiler.cmake
index 25a36535..f2fa6ea9 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCUDACompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCUDACompiler.cmake
@@ -21,6 +21,52 @@ if(CMAKE_CUDA_ABI_COMPILED)
   # The compiler worked so skip dedicated test below.
   set(CMAKE_CUDA_COMPILER_WORKS TRUE)
   message(STATUS "Check for working CUDA compiler: ${CMAKE_CUDA_COMPILER} - skipped")
+
+  # Run the test binary to detect the native architectures.
+  execute_process(COMMAND "${CMAKE_PLATFORM_INFO_DIR}/CMakeDetermineCompilerABI_CUDA.bin"
+    RESULT_VARIABLE _CUDA_ARCHS_RESULT
+    OUTPUT_VARIABLE _CUDA_ARCHS_OUTPUT
+    ERROR_VARIABLE  _CUDA_ARCHS_OUTPUT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  if(_CUDA_ARCHS_RESULT EQUAL 0)
+    if("$ENV{CMAKE_CUDA_ARCHITECTURES_NATIVE_CLAMP}")
+      # Undocumented hook used by CMake's CI.
+      # Clamp native architecture to version range supported by this CUDA.
+      list(GET CMAKE_CUDA_ARCHITECTURES_ALL 0  _CUDA_ARCH_MIN)
+      list(GET CMAKE_CUDA_ARCHITECTURES_ALL -1 _CUDA_ARCH_MAX)
+      set(CMAKE_CUDA_ARCHITECTURES_NATIVE "")
+      foreach(_CUDA_ARCH IN LISTS _CUDA_ARCHS_OUTPUT)
+        if(_CUDA_ARCH LESS _CUDA_ARCH_MIN)
+          set(_CUDA_ARCH "${_CUDA_ARCH_MIN}")
+        endif()
+        if(_CUDA_ARCH GREATER _CUDA_ARCH_MAX)
+          set(_CUDA_ARCH "${_CUDA_ARCH_MAX}")
+        endif()
+        list(APPEND CMAKE_CUDA_ARCHITECTURES_NATIVE ${_CUDA_ARCH})
+      endforeach()
+      unset(_CUDA_ARCH)
+      unset(_CUDA_ARCH_MIN)
+      unset(_CUDA_ARCH_MAX)
+    else()
+      set(CMAKE_CUDA_ARCHITECTURES_NATIVE "${_CUDA_ARCHS_OUTPUT}")
+    endif()
+    list(REMOVE_DUPLICATES CMAKE_CUDA_ARCHITECTURES_NATIVE)
+    list(TRANSFORM CMAKE_CUDA_ARCHITECTURES_NATIVE APPEND "-real")
+  else()
+    if(NOT _CUDA_ARCHS_RESULT MATCHES "[0-9]+")
+      set(_CUDA_ARCHS_STATUS " (${_CUDA_ARCHS_RESULT})")
+    else()
+      set(_CUDA_ARCHS_STATUS "")
+    endif()
+    string(REPLACE "\n" "\n  " _CUDA_ARCHS_OUTPUT "  ${_CUDA_ARCHS_OUTPUT}")
+    file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+      "Detecting the CUDA native architecture(s) failed with "
+      "the following output:\n${_CUDA_ARCHS_OUTPUT}\n\n")
+  endif()
+  unset(_CUDA_ARCHS_EXE)
+  unset(_CUDA_ARCHS_RESULT)
+  unset(_CUDA_ARCHS_OUTPUT)
 endif()
 
 # This file is used by EnableLanguage in cmGlobalGenerator to
@@ -30,7 +76,7 @@ endif()
 # any makefiles or projects.
 if(NOT CMAKE_CUDA_COMPILER_WORKS)
   PrintTestCompilerStatus("CUDA")
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.cu
+  string(CONCAT __TestCompiler_testCudaCompilerSource
     "#ifndef __CUDACC__\n"
     "# error \"The CMAKE_CUDA_COMPILER is set to an invalid CUDA compiler\"\n"
     "#endif\n"
@@ -40,9 +86,10 @@ if(NOT CMAKE_CUDA_COMPILER_WORKS)
   unset(CMAKE_CUDA_COMPILER_WORKS)
 
   # Puts test result in cache variable.
-  try_compile(CMAKE_CUDA_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.cu
+  try_compile(CMAKE_CUDA_COMPILER_WORKS
+    SOURCE_FROM_VAR main.cu __TestCompiler_testCudaCompilerSource
     OUTPUT_VARIABLE __CMAKE_CUDA_COMPILER_OUTPUT)
+  unset(__TestCompiler_testCudaCompilerSource)
 
   # Move result from cache to normal variable.
   set(CMAKE_CUDA_COMPILER_WORKS ${CMAKE_CUDA_COMPILER_WORKS})
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCXXCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCXXCompiler.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestCXXCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestCXXCompiler.cmake
index bbe35334..fa4016a2 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCXXCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCXXCompiler.cmake
@@ -38,7 +38,7 @@ endif()
 if(NOT CMAKE_CXX_COMPILER_WORKS)
   PrintTestCompilerStatus("CXX")
   __TestCompiler_setTryCompileTargetType()
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCXXCompiler.cxx
+  string(CONCAT __TestCompiler_testCXXCompilerSource
     "#ifndef __cplusplus\n"
     "# error \"The CMAKE_CXX_COMPILER is set to a C compiler\"\n"
     "#endif\n"
@@ -46,9 +46,10 @@ if(NOT CMAKE_CXX_COMPILER_WORKS)
   # Clear result from normal variable.
   unset(CMAKE_CXX_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_CXX_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCXXCompiler.cxx
+  try_compile(CMAKE_CXX_COMPILER_WORKS
+    SOURCE_FROM_VAR testCXXCompiler.cxx __TestCompiler_testCXXCompilerSource
     OUTPUT_VARIABLE __CMAKE_CXX_COMPILER_OUTPUT)
+  unset(__TestCompiler_testCXXCompilerSource)
   # Move result from cache to normal variable.
   set(CMAKE_CXX_COMPILER_WORKS ${CMAKE_CXX_COMPILER_WORKS})
   unset(CMAKE_CXX_COMPILER_WORKS CACHE)
@@ -56,7 +57,7 @@ if(NOT CMAKE_CXX_COMPILER_WORKS)
   if(NOT CMAKE_CXX_COMPILER_WORKS)
     PrintTestCompilerResult(CHECK_FAIL "broken")
     file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-      "Determining if the CXX compiler works failed with "
+      "Determining if the C++ compiler works failed with "
       "the following output:\n${__CMAKE_CXX_COMPILER_OUTPUT}\n\n")
     string(REPLACE "\n" "\n  " _output "${__CMAKE_CXX_COMPILER_OUTPUT}")
     message(FATAL_ERROR "The C++ compiler\n  \"${CMAKE_CXX_COMPILER}\"\n"
@@ -66,7 +67,7 @@ if(NOT CMAKE_CXX_COMPILER_WORKS)
   endif()
   PrintTestCompilerResult(CHECK_PASS "works")
   file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-    "Determining if the CXX compiler works passed with "
+    "Determining if the C++ compiler works passed with "
     "the following output:\n${__CMAKE_CXX_COMPILER_OUTPUT}\n\n")
 endif()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestCompilerCommon.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestCompilerCommon.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestCompilerCommon.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestCompilerCommon.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestFortranCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestFortranCompiler.cmake
similarity index 82%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestFortranCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestFortranCompiler.cmake
index f25788df..e6d1f6d5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestFortranCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestFortranCompiler.cmake
@@ -17,11 +17,18 @@ unset(CMAKE_Fortran_COMPILER_WORKS CACHE)
 
 # Try to identify the ABI and configure it into CMakeFortranCompiler.cmake
 include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerABI.cmake)
-CMAKE_DETERMINE_COMPILER_ABI(Fortran ${CMAKE_ROOT}/Modules/CMakeFortranCompilerABI.F)
+CMAKE_DETERMINE_COMPILER_ABI(Fortran ${CMAKE_ROOT}/Modules/CMakeFortranCompilerABI.F90)
 if(CMAKE_Fortran_ABI_COMPILED)
   # The compiler worked so skip dedicated test below.
   set(CMAKE_Fortran_COMPILER_WORKS TRUE)
+  set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 1)
   message(STATUS "Check for working Fortran compiler: ${CMAKE_Fortran_COMPILER} - skipped")
+else()
+  cmake_determine_compiler_abi(Fortran ${CMAKE_ROOT}/Modules/CMakeFortranCompilerABI.F)
+  if(CMAKE_Fortran_ABI_COMPILED)
+    set(CMAKE_Fortran_COMPILER_WORKS TRUE)
+    message(STATUS "Check for working Fortran 77 compiler: ${CMAKE_Fortran_COMPILER} - skipped")
+  endif()
 endif()
 
 # This file is used by EnableLanguage in cmGlobalGenerator to
@@ -31,7 +38,7 @@ endif()
 # any makefiles or projects.
 if(NOT CMAKE_Fortran_COMPILER_WORKS)
   PrintTestCompilerStatus("Fortran")
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f "
+  set(__TestCompiler_testFortranCompilerSource "
         PROGRAM TESTFortran
         PRINT *, 'Hello'
         END
@@ -39,9 +46,10 @@ if(NOT CMAKE_Fortran_COMPILER_WORKS)
   # Clear result from normal variable.
   unset(CMAKE_Fortran_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_Fortran_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f
+  try_compile(CMAKE_Fortran_COMPILER_WORKS
+    SOURCE_FROM_VAR testFortranCompiler.f __TestCompiler_testFortranCompilerSource
     OUTPUT_VARIABLE OUTPUT)
+  unset(__TestCompiler_testFortranCompilerSource)
   # Move result from cache to normal variable.
   set(CMAKE_Fortran_COMPILER_WORKS ${CMAKE_Fortran_COMPILER_WORKS})
   unset(CMAKE_Fortran_COMPILER_WORKS CACHE)
@@ -65,14 +73,15 @@ endif()
 # Test for Fortran 90 support by using an f90-specific construct.
 if(NOT DEFINED CMAKE_Fortran_COMPILER_SUPPORTS_F90)
   message(CHECK_START "Checking whether ${CMAKE_Fortran_COMPILER} supports Fortran 90")
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompilerF90.f90 "
+  set(__TestCompiler_testFortranCompilerSource "
     PROGRAM TESTFortran90
     integer stop ; stop = 1 ; do while ( stop .eq. 0 ) ; end do
     END PROGRAM TESTFortran90
 ")
-  try_compile(CMAKE_Fortran_COMPILER_SUPPORTS_F90 ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompilerF90.f90
+  try_compile(CMAKE_Fortran_COMPILER_SUPPORTS_F90
+    SOURCE_FROM_VAR testFortranCompilerF90.f90 __TestCompiler_testFortranCompilerF90Source
     OUTPUT_VARIABLE OUTPUT)
+  unset(__TestCompiler_testFortranCompilerF90Source)
   if(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
     message(CHECK_PASS "yes")
     file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestGNU.c b/deps/cmake/share/cmake-3.25/Modules/CMakeTestGNU.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestGNU.c
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestGNU.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestHIPCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestHIPCompiler.cmake
similarity index 80%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestHIPCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestHIPCompiler.cmake
index 62f06573..1da0ae4e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestHIPCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestHIPCompiler.cmake
@@ -10,7 +10,7 @@ if(CMAKE_HIP_COMPILER_FORCED)
 endif()
 
 set(__CMAKE_HIP_FLAGS "${CMAKE_HIP_FLAGS}")
-string(APPEND CMAKE_HIP_FLAGS "--cuda-host-only")
+string(APPEND CMAKE_HIP_FLAGS " --cuda-host-only")
 
 include(CMakeTestCompilerCommon)
 
@@ -41,7 +41,7 @@ endif()
 if(NOT CMAKE_HIP_COMPILER_WORKS)
   PrintTestCompilerStatus("HIP")
   __TestCompiler_setTryCompileTargetType()
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testHIPCompiler.hip
+  string(CONCAT __TestCompiler_testHIPCompilerSource
     "#ifndef __HIP__\n"
     "# error \"The CMAKE_HIP_COMPILER is set to a C/CXX compiler\"\n"
     "#endif\n"
@@ -49,9 +49,10 @@ if(NOT CMAKE_HIP_COMPILER_WORKS)
   # Clear result from normal variable.
   unset(CMAKE_HIP_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_HIP_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testHIPCompiler.hip
+  try_compile(CMAKE_HIP_COMPILER_WORKS
+    SOURCE_FROM_VAR testHIPCompiler.hip __TestCompiler_testHIPCompilerSource
     OUTPUT_VARIABLE __CMAKE_HIP_COMPILER_OUTPUT)
+  unset(__TestCompiler_testHIPCompilerSource)
   # Move result from cache to normal variable.
   set(CMAKE_HIP_COMPILER_WORKS ${CMAKE_HIP_COMPILER_WORKS})
   unset(CMAKE_HIP_COMPILER_WORKS CACHE)
@@ -81,20 +82,6 @@ unset(__CMAKE_HIP_FLAGS)
 include(${CMAKE_ROOT}/Modules/CMakeDetermineCompileFeatures.cmake)
 CMAKE_DETERMINE_COMPILE_FEATURES(HIP)
 
-
-# Setup the following:
-# Configure the new template file CMakeHipRuntime.cmake to
-# - ${CMAKE_PLATFORM_INFO_DIR}/
-# This file will do the actual find_package query. We than have
-# CMakeHIPInformation.cmake include `CMakeHipRuntime`
-# So it is included once system information has been finished
-#
-configure_file(
- ${CMAKE_ROOT}/Modules/CMakeHIPRuntime.cmake.in
- ${CMAKE_PLATFORM_INFO_DIR}/CMakeHIPRuntime.cmake
- @ONLY
-)
-
 # Re-configure to save learned information.
 configure_file(
   ${CMAKE_ROOT}/Modules/CMakeHIPCompiler.cmake.in
@@ -113,10 +100,3 @@ endif()
 set(CMAKE_TRY_COMPILE_TARGET_TYPE ${__CMAKE_SAVED_TRY_COMPILE_TARGET_TYPE})
 unset(__CMAKE_SAVED_TRY_COMPILE_TARGET_TYPE)
 unset(__CMAKE_HIP_COMPILER_OUTPUT)
-
-# Load the file and find the relevant HIP runtime.
-# This file will only exist after all compiler detection has finished
-include(${CMAKE_PLATFORM_INFO_DIR}/CMakeHIPRuntime.cmake)
-if(COMMAND _CMAKE_FIND_HIP_RUNTIME)
-  _CMAKE_FIND_HIP_RUNTIME()
-endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestISPCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestISPCCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestISPCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestISPCCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestJavaCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestJavaCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestJavaCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestJavaCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestOBJCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestOBJCCompiler.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestOBJCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestOBJCCompiler.cmake
index 20d1f8be..bbc90a76 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestOBJCCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestOBJCCompiler.cmake
@@ -38,7 +38,7 @@ endif()
 if(NOT CMAKE_OBJC_COMPILER_WORKS)
   PrintTestCompilerStatus("OBJC")
   __TestCompiler_setTryCompileTargetType()
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testOBJCCompiler.m
+  string(CONCAT __TestCompiler_testObjCCompilerSource
     "#ifdef __cplusplus\n"
     "# error \"The CMAKE_OBJC_COMPILER is set to a C++ compiler\"\n"
     "#endif\n"
@@ -50,9 +50,10 @@ if(NOT CMAKE_OBJC_COMPILER_WORKS)
   # Clear result from normal variable.
   unset(CMAKE_OBJC_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_OBJC_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testOBJCCompiler.m
+  try_compile(CMAKE_OBJC_COMPILER_WORKS
+    SOURCE_FROM_VAR testObjCCompiler.m __TestCompiler_testObjCCompilerSource
     OUTPUT_VARIABLE __CMAKE_OBJC_COMPILER_OUTPUT)
+  unset(__TestCompiler_testObjCCompilerSource)
   # Move result from cache to normal variable.
   set(CMAKE_OBJC_COMPILER_WORKS ${CMAKE_OBJC_COMPILER_WORKS})
   unset(CMAKE_OBJC_COMPILER_WORKS CACHE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestOBJCXXCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestOBJCXXCompiler.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestOBJCXXCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestOBJCXXCompiler.cmake
index 4f7185f7..aceb939c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestOBJCXXCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestOBJCXXCompiler.cmake
@@ -38,7 +38,7 @@ endif()
 if(NOT CMAKE_OBJCXX_COMPILER_WORKS)
   PrintTestCompilerStatus("OBJCXX")
   __TestCompiler_setTryCompileTargetType()
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testOBJCXXCompiler.mm
+  string(CONCAT __TestCompiler_testObjCXXCompilerSource
     "#ifndef __cplusplus\n"
     "# error \"The CMAKE_OBJCXX_COMPILER is set to a C compiler\"\n"
     "#endif\n"
@@ -49,9 +49,10 @@ if(NOT CMAKE_OBJCXX_COMPILER_WORKS)
   # Clear result from normal variable.
   unset(CMAKE_OBJCXX_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_OBJCXX_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testOBJCXXCompiler.mm
+  try_compile(CMAKE_OBJCXX_COMPILER_WORKS
+    SOURCE_FROM_VAR testObjCXXCompiler.mm __TestCompiler_testObjCXXCompilerSource
     OUTPUT_VARIABLE __CMAKE_OBJCXX_COMPILER_OUTPUT)
+  unset(__TestCompiler_testObjCXXCompilerSource)
   # Move result from cache to normal variable.
   set(CMAKE_OBJCXX_COMPILER_WORKS ${CMAKE_OBJCXX_COMPILER_WORKS})
   unset(CMAKE_OBJCXX_COMPILER_WORKS CACHE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestRCCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestRCCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestRCCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestRCCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeTestSwiftCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeTestSwiftCompiler.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeTestSwiftCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeTestSwiftCompiler.cmake
index 2f2546f8..88a864cc 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CMakeTestSwiftCompiler.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CMakeTestSwiftCompiler.cmake
@@ -21,13 +21,12 @@ unset(CMAKE_Swift_COMPILER_WORKS CACHE)
 # any makefiles or projects.
 if(NOT CMAKE_Swift_COMPILER_WORKS)
   PrintTestCompilerStatus("Swift")
-  file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift
-    "print(\"CMake\")\n")
   # Clear result from normal variable.
   unset(CMAKE_Swift_COMPILER_WORKS)
   # Puts test result in cache variable.
-  try_compile(CMAKE_Swift_COMPILER_WORKS ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/main.swift
+  set(__CMAKE_Swift_TEST_SOURCE "print(\"CMake\")\n")
+  try_compile(CMAKE_Swift_COMPILER_WORKS
+    SOURCE_FROM_VAR main.swift __CMAKE_Swift_TEST_SOURCE
     OUTPUT_VARIABLE __CMAKE_Swift_COMPILER_OUTPUT)
   # Move result from cache to normal variable.
   set(CMAKE_Swift_COMPILER_WORKS ${CMAKE_Swift_COMPILER_WORKS})
@@ -64,4 +63,5 @@ else()
   include(${CMAKE_PLATFORM_INFO_DIR}/CMakeSwiftCompiler.cmake)
 endif()
 
+unset(__CMAKE_Swift_TEST_SOURCE)
 unset(__CMAKE_Swift_COMPILER_OUTPUT)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeUnixFindMake.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeUnixFindMake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeUnixFindMake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeUnixFindMake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CMakeVerifyManifest.cmake b/deps/cmake/share/cmake-3.25/Modules/CMakeVerifyManifest.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CMakeVerifyManifest.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CMakeVerifyManifest.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CPack.cmake b/deps/cmake/share/cmake-3.25/Modules/CPack.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/CPack.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CPack.cmake
index 373a7073..7c3ad6b8 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CPack.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CPack.cmake
@@ -53,9 +53,9 @@ Here's how it works:
 
 * :manual:`cpack <cpack(1)>` runs
 * it includes ``CPackConfig.cmake``
-* it iterates over the generators given by the ``-G`` command line option,
-  or if no such option was specified, over the list of generators given by
-  the :variable:`CPACK_GENERATOR` variable set in the ``CPackConfig.cmake``
+* it iterates over the generators given by the :option:`-G <cpack -G>` command
+  line option, or if no such option was specified, over the list of generators
+  given by the :variable:`CPACK_GENERATOR` variable set in the ``CPackConfig.cmake``
   input file.
 * foreach generator, it then
 
@@ -217,7 +217,8 @@ installers.  The most commonly-used variables are:
   to the user by the produced installer (often with an explicit "Accept"
   button, for graphical installers) prior to installation.  This license
   file is NOT added to the installed files but is used by some CPack generators
-  like NSIS.  If you want to install a license file (may be the same as this
+  like NSIS.  If you want to use UTF-8 characters, the file needs to be encoded
+  in UTF-8 BOM.  If you want to install a license file (may be the same as this
   one) along with your project, you must add an appropriate CMake
   :command:`install` command in your ``CMakeLists.txt``.
 
@@ -246,9 +247,9 @@ installers.  The most commonly-used variables are:
   List of CPack generators to use.  If not specified, CPack will create a
   set of options following the naming pattern
   :variable:`CPACK_BINARY_<GENNAME>` (e.g. ``CPACK_BINARY_NSIS``) allowing
-  the user to enable/disable individual generators.  If the ``-G`` option is
-  given on the :manual:`cpack <cpack(1)>` command line, it will override this
-  variable and any ``CPACK_BINARY_<GENNAME>`` options.
+  the user to enable/disable individual generators.  If the :option:`-G <cpack -G>`
+  option is given on the :manual:`cpack <cpack(1)>` command line, it will override
+  this variable and any ``CPACK_BINARY_<GENNAME>`` options.
 
 .. variable:: CPACK_OUTPUT_CONFIG_FILE
 
@@ -262,7 +263,7 @@ installers.  The most commonly-used variables are:
   create Start Menu shortcuts.  For example, setting this to the list
   ``ccmake;CMake`` will create a shortcut named "CMake" that will execute the
   installed executable ``ccmake``.  Not all CPack generators use it (at least
-  NSIS, WIX and OSXX11 do).
+  NSIS, and WIX do).
 
 .. variable:: CPACK_STRIP_FILES
 
@@ -304,15 +305,26 @@ installers.  The most commonly-used variables are:
 
   By default ``CPACK_THREADS`` is set to ``1``.
 
-  Currently only ``xz`` compression *may* take advantage of multiple cores.
+  The following compression methods may take advantage of multiple cores:
+
+  ``xz``
+    Supported if CMake is built with a ``liblzma`` that supports
+    parallel compression.
+
+    .. versionadded:: 3.21
+
+      Official CMake binaries available on ``cmake.org`` now ship
+      with a ``liblzma`` that supports parallel compression.
+      Older versions did not.
+
+  ``zstd``
+    .. versionadded:: 3.24
+
+    Supported if CMake is built with libarchive 3.6 or higher.
+    Official CMake binaries available on ``cmake.org`` support it.
+
   Other compression methods ignore this value and use only one thread.
 
-  .. versionadded:: 3.21
-
-    Official CMake binaries available on ``cmake.org`` now ship
-    with a ``liblzma`` that supports parallel compression.
-    Older versions did not.
-
 Variables for Source Package Generators
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -458,7 +470,35 @@ The following variables are for advanced uses of CPack:
   generates (when :variable:`CPACK_GENERATOR` is not set) a set of CMake
   options (see CMake :command:`option` command) which may then be used to
   select the CPack generator(s) to be used when building the ``package``
-  target or when running :manual:`cpack <cpack(1)>` without the ``-G`` option.
+  target or when running :manual:`cpack <cpack(1)>` without the
+  :option:`-G <cpack -G>` option.
+
+.. variable:: CPACK_READELF_EXECUTABLE
+
+  .. versionadded:: 3.25
+
+  Specify the ``readelf`` executable path used by CPack.
+  The default value will be ``CMAKE_READELF`` when set.  Otherwise,
+  the default value will be empty and CPack will use :command:`find_program`
+  to determine the ``readelf`` path when needed.
+
+.. variable:: CPACK_OBJCOPY_EXECUTABLE
+
+  .. versionadded:: 3.25
+
+  Specify the ``objcopy`` executable path used by CPack.
+  The default value will be ``CMAKE_OBJCOPY`` when set.  Otherwise,
+  the default value will be empty and CPack will use :command:`find_program`
+  to determine the ``objcopy`` path when needed.
+
+.. variable:: CPACK_OBJDUMP_EXECUTABLE
+
+  .. versionadded:: 3.25
+
+  Specify the ``objdump`` executable path used by CPack.
+  The default value will be ``CMAKE_OBJDUMP`` when set.  Otherwise,
+  the default value will be empty and CPack will use :command:`find_program`
+  to determine the ``objdump`` path when needed.
 
 #]=======================================================================]
 
@@ -579,6 +619,16 @@ _cpack_set_default(CPACK_RESOURCE_FILE_WELCOME
 
 _cpack_set_default(CPACK_MODULE_PATH "${CMAKE_MODULE_PATH}")
 
+if(CMAKE_READELF)
+  _cpack_set_default(CPACK_READELF_EXECUTABLE "${CMAKE_READELF}")
+endif()
+if(CMAKE_OBJCOPY)
+  _cpack_set_default(CPACK_OBJCOPY_EXECUTABLE "${CMAKE_OBJCOPY}")
+endif()
+if(CMAKE_OBJDUMP)
+  _cpack_set_default(CPACK_OBJDUMP_EXECUTABLE "${CMAKE_OBJDUMP}")
+endif()
+
 # Set default directory creation permissions mode
 if(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS)
   _cpack_set_default(CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
@@ -658,14 +708,10 @@ if(NOT CPACK_GENERATOR)
       if(APPLE)
         option(CPACK_BINARY_BUNDLE       "Enable to build OSX bundles"      OFF)
         option(CPACK_BINARY_DRAGNDROP    "Enable to build OSX Drag And Drop package" OFF)
-        option(CPACK_BINARY_OSXX11       "Enable to build OSX X11 packages (deprecated)" OFF)
-        option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages (deprecated)" OFF)
         option(CPACK_BINARY_PRODUCTBUILD "Enable to build productbuild packages" OFF)
         mark_as_advanced(
           CPACK_BINARY_BUNDLE
           CPACK_BINARY_DRAGNDROP
-          CPACK_BINARY_OSXX11
-          CPACK_BINARY_PACKAGEMAKER
           CPACK_BINARY_PRODUCTBUILD
           )
       else()
@@ -717,8 +763,6 @@ if(NOT CPACK_GENERATOR)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_IFW          IFW)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_NSIS         NSIS)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_NUGET        NuGet)
-  cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_OSXX11       OSXX11)
-  cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_PACKAGEMAKER PackageMaker)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_PRODUCTBUILD productbuild)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_RPM          RPM)
   cpack_optional_append(CPACK_GENERATOR  CPACK_BINARY_STGZ         STGZ)
@@ -808,6 +852,23 @@ _cpack_set_default(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 _cpack_set_default(CPACK_NSIS_INSTALLER_ICON_CODE "")
 _cpack_set_default(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
 
+# DragNDrop specific variables
+if(NOT DEFINED CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE
+    AND CPACK_RESOURCE_FILE_LICENSE AND NOT CPACK_RESOURCE_FILE_LICENSE STREQUAL "${CMAKE_ROOT}/Templates/CPack.GenericLicense.txt")
+  cmake_policy(GET CMP0133 _CPack_CMP0133)
+  if(NOT "x${_CPack_CMP0133}x" STREQUAL "xNEWx")
+    if(NOT "x${_CPack_CMP0133}x" STREQUAL "xOLDx" AND CMAKE_POLICY_WARNING_CMP0133)
+      cmake_policy(GET_WARNING CMP0133 _CMP0133_warning)
+      message(AUTHOR_WARNING
+        "${_CMP0133_warning}\n"
+        "For compatibility, CMake will enable the SLA in the CPack DragNDrop Generator."
+        )
+    endif()
+    _cpack_set_default(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE ON)
+  endif()
+  unset(_CPack_CMP0133)
+endif()
+
 # WiX specific variables
 _cpack_set_default(CPACK_WIX_SIZEOF_VOID_P "${CMAKE_SIZEOF_VOID_P}")
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CPackComponent.cmake b/deps/cmake/share/cmake-3.25/Modules/CPackComponent.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CPackComponent.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CPackComponent.cmake
index 1f8c38c4..529f4e7d 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CPackComponent.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CPackComponent.cmake
@@ -301,7 +301,7 @@ be built and installed on system using macOS 10.5 or later.
 
 The site argument is a URL where the archives for downloadable
 components will reside, e.g.,
-https://cmake.org/files/2.6.1/installer/ All of the archives
+https://cmake.org/files/v3.25/ All of the archives
 produced by CPack should be uploaded to that location.
 
 UPLOAD_DIRECTORY is the local directory where CPack will create the
@@ -327,32 +327,34 @@ OS X.
 if(NOT CPackComponent_CMake_INCLUDED)
 set(CPackComponent_CMake_INCLUDED 1)
 
-# Macro that appends a SET command for the given variable name (var)
-# to the macro named strvar, but only if the variable named "var"
+# Function that appends a SET command for the given variable name (var)
+# to the string named strvar, but only if the variable named "var"
 # has been defined. The string will eventually be appended to a CPack
 # configuration file.
-macro(cpack_append_variable_set_command var strvar)
+function(cpack_append_variable_set_command var strvar)
   if (DEFINED ${var})
     string(APPEND ${strvar} "set(${var}")
     foreach(APPENDVAL ${${var}})
       string(APPEND ${strvar} " ${APPENDVAL}")
     endforeach()
     string(APPEND ${strvar} ")\n")
+    set(${strvar} "${${strvar}}" PARENT_SCOPE)
   endif ()
-endmacro()
+endfunction()
 
-# Macro that appends a SET command for the given variable name (var)
-# to the macro named strvar, but only if the variable named "var"
+# Function that appends a SET command for the given variable name (var)
+# to the string named strvar, but only if the variable named "var"
 # has been defined and is a string. The string will eventually be
 # appended to a CPack configuration file.
-macro(cpack_append_string_variable_set_command var strvar)
+function(cpack_append_string_variable_set_command var strvar)
   if (DEFINED ${var})
     list(LENGTH ${var} CPACK_APP_VALUE_LEN)
     if(${CPACK_APP_VALUE_LEN} EQUAL 1)
       string(APPEND ${strvar} "set(${var} \"${${var}}\")\n")
     endif()
+    set(${strvar} "${${strvar}}" PARENT_SCOPE)
   endif ()
-endmacro()
+endfunction()
 
 # Macro that appends a SET command for the given list variable name (var)
 # to the macro named strvar, but only if the variable named "var"
diff --git a/deps/cmake/share/cmake-3.21/Modules/CPackIFW.cmake b/deps/cmake/share/cmake-3.25/Modules/CPackIFW.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/CPackIFW.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CPackIFW.cmake
index 2087a518..d4e02f12 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CPackIFW.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CPackIFW.cmake
@@ -439,33 +439,57 @@ set(_CPACK_IFW_PREFIXES
   "QtIFW-")
 
 set(_CPACK_IFW_VERSIONS
+  "4.5.0"
+  "4.5"
+  "4.4.2"
+  "4.4.1"
+  "4.4.0"
+  "4.4"
+  "4.3.0"
+  "4.3"
+  "4.2.0"
+  "4.2"
+  "4.1.1"
+  "4.1.0"
+  "4.1"
+  "4.0.1"
+  "4.0.0"
   "4.0"
-  "3.2"
+  "3.2.3"
+  "3.2.2"
+  "3.2.1"
   "3.2.0"
-  "3.1"
+  "3.2"
+  "3.1.1"
   "3.1.0"
-  "3.0"
+  "3.1"
+  "3.0.6"
+  "3.0.4"
+  "3.0.3"
+  "3.0.2"
+  "3.0.1"
   "3.0.0"
-  "2.3"
+  "3.0"
   "2.3.0"
-  "2.2"
+  "2.3"
   "2.2.0"
-  "2.1"
+  "2.2"
   "2.1.0"
-  "2.0"
+  "2.1"
   "2.0.5"
   "2.0.3"
   "2.0.2"
   "2.0.1"
   "2.0.0"
-  "1.6"
+  "2.0"
   "1.6.0"
-  "1.5"
+  "1.6"
   "1.5.0"
-  "1.4"
+  "1.5"
   "1.4.0"
-  "1.3"
-  "1.3.0")
+  "1.4"
+  "1.3.0"
+  "1.3")
 
 set(_CPACK_IFW_SUFFIXES "bin")
 foreach(_CPACK_IFW_PREFIX ${_CPACK_IFW_PREFIXES})
diff --git a/deps/cmake/share/cmake-3.21/Modules/CPackIFWConfigureFile.cmake b/deps/cmake/share/cmake-3.25/Modules/CPackIFWConfigureFile.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CPackIFWConfigureFile.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CPackIFWConfigureFile.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CSharpUtilities.cmake b/deps/cmake/share/cmake-3.25/Modules/CSharpUtilities.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CSharpUtilities.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CSharpUtilities.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CTest.cmake b/deps/cmake/share/cmake-3.25/Modules/CTest.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/CTest.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CTest.cmake
index 8f8ebb4b..16283d6a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CTest.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CTest.cmake
@@ -33,7 +33,7 @@ file at the top of the project with content such as::
 (the CDash server can provide the file to a project administrator who
 configures ``MyProject``).  Settings in the config file are shared by
 both this ``CTest`` module and the :manual:`ctest(1)` command-line
-:ref:`Dashboard Client` mode (``ctest -S``).
+:ref:`Dashboard Client` mode (:option:`ctest -S`).
 
 While building a project for submission to CDash, CTest scans the
 build output for errors and warnings and reports them with surrounding
diff --git a/deps/cmake/share/cmake-3.21/Modules/CTestCoverageCollectGCOV.cmake b/deps/cmake/share/cmake-3.25/Modules/CTestCoverageCollectGCOV.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CTestCoverageCollectGCOV.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CTestCoverageCollectGCOV.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CTestScriptMode.cmake b/deps/cmake/share/cmake-3.25/Modules/CTestScriptMode.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CTestScriptMode.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CTestScriptMode.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CTestTargets.cmake b/deps/cmake/share/cmake-3.25/Modules/CTestTargets.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CTestTargets.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CTestTargets.cmake
index 838fbbfe..b91b48ee 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CTestTargets.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CTestTargets.cmake
@@ -86,7 +86,7 @@ if(NOT _CTEST_TARGETS_ADDED)
   # or "RUN_TESTS" target:
   if(CTEST_TEST_TARGET_ALIAS)
     add_custom_target(${CTEST_TEST_TARGET_ALIAS}
-      ${CMAKE_CTEST_COMMAND} ${__conf_types}
+      ${CMAKE_CTEST_COMMAND} ${CMAKE_CTEST_ARGUMENTS} ${__conf_types}
       USES_TERMINAL
       )
   endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CTestUseLaunchers.cmake b/deps/cmake/share/cmake-3.25/Modules/CTestUseLaunchers.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/CTestUseLaunchers.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CTestUseLaunchers.cmake
index 23a206b2..5c544f8c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CTestUseLaunchers.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CTestUseLaunchers.cmake
@@ -11,7 +11,7 @@ CTestUseLaunchers is automatically included when you include(CTest).
 However, it is split out into its own module file so projects can use
 the CTEST_USE_LAUNCHERS functionality independently.
 
-To use launchers, set CTEST_USE_LAUNCHERS to ON in a ctest -S
+To use launchers, set CTEST_USE_LAUNCHERS to ON in a :option:`ctest -S`
 dashboard script, and then also set it in the cache of the configured
 project.  Both cmake and ctest need to know the value of it for the
 launchers to work properly.  CMake needs to know in order to generate
@@ -27,9 +27,12 @@ variable initialization only occurs if CTEST_USE_LAUNCHERS is not
 already defined.
 
 .. versionadded:: 3.8
-  If CTEST_USE_LAUNCHERS is on in a ctest -S script
+  If CTEST_USE_LAUNCHERS is on in a :option:`ctest -S` script
   the ctest_configure command will add -DCTEST_USE_LAUNCHERS:BOOL=TRUE
   to the cmake command used to configure the project.
+
+.. TODO Use RST markup
+
 #]=======================================================================]
 
 if(NOT DEFINED CTEST_USE_LAUNCHERS AND DEFINED ENV{CTEST_USE_LAUNCHERS_DEFAULT})
diff --git a/deps/cmake/share/cmake-3.25/Modules/CUDA/architectures.cmake b/deps/cmake/share/cmake-3.25/Modules/CUDA/architectures.cmake
new file mode 100644
index 00000000..d6469204
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/CUDA/architectures.cmake
@@ -0,0 +1,63 @@
+# See supported GPUs on Wikipedia
+# https://en.wikipedia.org/wiki/CUDA#GPUs_supported
+
+# Initial set based on CUDA 7.0.
+set(CMAKE_CUDA_ARCHITECTURES_ALL 20 21 30 35 37 50 52 53)
+set(CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 20 30 35 50)
+
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 8.0)
+  list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 60 61 62)
+  list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 60)
+endif()
+
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 9.0)
+  if(NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang" OR CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0)
+    list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 70 72)
+    list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 70)
+  endif()
+
+  list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL 20 21)
+  list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 20 21)
+endif()
+
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 10.0
+   AND (NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang" OR CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0))
+  list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 75)
+endif()
+
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 11.0)
+  if(NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang" OR CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0)
+    list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 80)
+    list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 80)
+  endif()
+
+  list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL 30)
+  list(REMOVE_ITEM CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 30)
+endif()
+
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 11.1
+   AND (NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang" OR CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0))
+  list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 86)
+endif()
+
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 11.4
+   AND (NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang"))
+  list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 87)
+endif()
+
+if(CMAKE_CUDA_COMPILER_TOOLKIT_VERSION VERSION_GREATER_EQUAL 11.8
+   AND (NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang"))
+  list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL 89 90)
+  list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR 90)
+endif()
+
+# only generate jit code for the newest arch for all/all-major
+list(POP_BACK CMAKE_CUDA_ARCHITECTURES_ALL _latest_arch)
+list(TRANSFORM CMAKE_CUDA_ARCHITECTURES_ALL APPEND "-real")
+list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL ${_latest_arch})
+
+list(POP_BACK CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR _latest_arch)
+list(TRANSFORM CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR APPEND "-real")
+list(APPEND CMAKE_CUDA_ARCHITECTURES_ALL_MAJOR ${_latest_arch})
+
+unset(_latest_arch)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCCompilerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCCompilerFlag.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCCompilerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCCompilerFlag.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCSourceCompiles.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCSourceCompiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCSourceCompiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCSourceCompiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCSourceRuns.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCSourceRuns.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCSourceRuns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCSourceRuns.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCXXCompilerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCXXCompilerFlag.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCXXCompilerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCXXCompilerFlag.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCXXSourceCompiles.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCXXSourceCompiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCXXSourceCompiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCXXSourceCompiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCXXSourceRuns.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCXXSourceRuns.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCXXSourceRuns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCXXSourceRuns.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCXXSymbolExists.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCXXSymbolExists.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCXXSymbolExists.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCXXSymbolExists.cmake
index b4da4fac..1fa08982 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckCXXSymbolExists.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckCXXSymbolExists.cmake
@@ -25,7 +25,7 @@ Check if a symbol exists as a function, variable, or macro in ``C++``.
   as a function or variable then the symbol must also be available for
   linking.  If the symbol is a type, enum value, or C++ template it will
   not be recognized: consider using the :module:`CheckTypeSize`
-  or :module:`CheckCXXSourceCompiles` module instead.
+  or :module:`CheckSourceCompiles` module instead.
 
 .. note::
 
@@ -74,5 +74,5 @@ include_guard(GLOBAL)
 include(CheckSymbolExists)
 
 macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
-  __CHECK_SYMBOL_EXISTS_IMPL("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+  __CHECK_SYMBOL_EXISTS_IMPL(CheckSymbolExists.cxx "${SYMBOL}" "${FILES}" "${VARIABLE}" )
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckCompilerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckCompilerFlag.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckCompilerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckCompilerFlag.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckForPthreads.c b/deps/cmake/share/cmake-3.25/Modules/CheckForPthreads.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckForPthreads.c
rename to deps/cmake/share/cmake-3.25/Modules/CheckForPthreads.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckFortranCompilerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckFortranCompilerFlag.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckFortranCompilerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckFortranCompilerFlag.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckFortranFunctionExists.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckFortranFunctionExists.cmake
similarity index 87%
rename from deps/cmake/share/cmake-3.21/Modules/CheckFortranFunctionExists.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckFortranFunctionExists.cmake
index ad72e2f0..7e3a7eed 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckFortranFunctionExists.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckFortranFunctionExists.cmake
@@ -20,6 +20,12 @@ Check if a Fortran function exists.
   ``<result>``
     variable to store the result; will be created as an internal cache variable.
 
+.. note::
+
+  This command does not detect functions in Fortran modules. In general it is
+  recommended to use :module:`CheckSourceCompiles` instead to determine if a
+  Fortran function or subroutine is available.
+
 The following variables may be set before calling this macro to modify
 the way the check is run:
 
@@ -52,8 +58,7 @@ macro(CHECK_FORTRAN_FUNCTION_EXISTS FUNCTION VARIABLE)
     else()
       set(CHECK_FUNCTION_EXISTS_ADD_LIBRARIES)
     endif()
-    file(WRITE
-    ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f
+    set(__CheckFunction_testFortranCompilerSource
     "
       program TESTFortran
       external ${FUNCTION}
@@ -62,12 +67,12 @@ macro(CHECK_FORTRAN_FUNCTION_EXISTS FUNCTION VARIABLE)
     "
     )
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f
+      SOURCE_FROM_VAR testFortranCompiler.f __CheckFunction_testFortranCompilerSource
       ${CHECK_FUNCTION_EXISTS_ADD_LINK_OPTIONS}
       ${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}
       OUTPUT_VARIABLE OUTPUT
     )
+    unset(__CheckFunction_testFortranCompilerSource)
     if(${VARIABLE})
       set(${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}")
       message(CHECK_PASS "found")
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckFortranSourceCompiles.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckFortranSourceCompiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckFortranSourceCompiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckFortranSourceCompiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckFortranSourceRuns.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckFortranSourceRuns.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckFortranSourceRuns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckFortranSourceRuns.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckFunctionExists.c b/deps/cmake/share/cmake-3.25/Modules/CheckFunctionExists.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckFunctionExists.c
rename to deps/cmake/share/cmake-3.25/Modules/CheckFunctionExists.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckFunctionExists.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckFunctionExists.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/CheckFunctionExists.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckFunctionExists.cmake
index 9efa132b..60f01841 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckFunctionExists.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckFunctionExists.cmake
@@ -81,17 +81,15 @@ macro(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
     endif()
 
     if(CMAKE_C_COMPILER_LOADED)
-      set(_cfe_source ${CMAKE_ROOT}/Modules/CheckFunctionExists.c)
+      set(_cfe_source CheckFunctionExists.c)
     elseif(CMAKE_CXX_COMPILER_LOADED)
-      set(_cfe_source ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckFunctionExists/CheckFunctionExists.cxx)
-      configure_file(${CMAKE_ROOT}/Modules/CheckFunctionExists.c "${_cfe_source}" COPYONLY)
+      set(_cfe_source CheckFunctionExists.cxx)
     else()
       message(FATAL_ERROR "CHECK_FUNCTION_EXISTS needs either C or CXX language enabled")
     endif()
 
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${_cfe_source}
+      SOURCE_FROM_FILE "${_cfe_source}" "${CMAKE_ROOT}/Modules/CheckFunctionExists.c"
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${CHECK_FUNCTION_EXISTS_ADD_LINK_OPTIONS}
       ${CHECK_FUNCTION_EXISTS_ADD_LIBRARIES}
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported.cmake
similarity index 81%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported.cmake
index 0bc3c923..9108e341 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported.cmake
@@ -36,6 +36,11 @@ module will return error in this case. See policy :policy:`CMP0069` for details.
 .. versionadded:: 3.13
   Add support for Visual Studio generators.
 
+.. versionadded:: 3.24
+  The check uses the caller's :variable:`CMAKE_<LANG>_FLAGS`
+  and :variable:`CMAKE_<LANG>_FLAGS_<CONFIG>` values.
+  See policy :policy:`CMP0138`.
+
 Examples
 ^^^^^^^^
 
@@ -71,6 +76,23 @@ endmacro()
 
 # Run IPO/LTO test
 macro(_ipo_run_language_check language)
+  set(_C_ext "c")
+  set(_CXX_ext "cpp")
+  set(_Fortran_ext "f")
+  string(COMPARE EQUAL "${language}" "CUDA" is_cuda)
+
+  set(ext ${_${language}_ext})
+  if(NOT "${ext}" STREQUAL "")
+    set(copy_sources foo.${ext} main.${ext})
+  elseif(is_cuda)
+    if(_CMAKE_CUDA_IPO_SUPPORTED_BY_CMAKE)
+      set("${X_RESULT}" YES PARENT_SCOPE)
+    endif()
+    return()
+  else()
+    message(FATAL_ERROR "Language not supported")
+  endif()
+
   set(testdir "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/_CMakeLTOTest-${language}")
 
   file(REMOVE_RECURSE "${testdir}")
@@ -95,20 +117,6 @@ macro(_ipo_run_language_check language)
       @ONLY
   )
 
-  string(COMPARE EQUAL "${language}" "C" is_c)
-  string(COMPARE EQUAL "${language}" "CXX" is_cxx)
-  string(COMPARE EQUAL "${language}" "Fortran" is_fortran)
-
-  if(is_c)
-    set(copy_sources foo.c main.c)
-  elseif(is_cxx)
-    set(copy_sources foo.cpp main.cpp)
-  elseif(is_fortran)
-    set(copy_sources foo.f main.f)
-  else()
-    message(FATAL_ERROR "Language not supported")
-  endif()
-
   foreach(x ${copy_sources})
     configure_file(
         "${try_compile_src}/${x}"
@@ -117,14 +125,25 @@ macro(_ipo_run_language_check language)
     )
   endforeach()
 
+  if(ipo_CMP0138 STREQUAL "NEW")
+    set(CMAKE_TRY_COMPILE_CONFIGURATION Debug)
+    set(_CMAKE_LANG_FLAGS
+      "-DCMAKE_${language}_FLAGS:STRING=${CMAKE_${language}_FLAGS}"
+      "-DCMAKE_${language}_FLAGS_DEBUG:STRING=${CMAKE_${language}_FLAGS_DEBUG}"
+      )
+  else()
+    set(_CMAKE_LANG_FLAGS "")
+  endif()
+
   try_compile(
       _IPO_LANGUAGE_CHECK_RESULT
-      "${bindir}"
-      "${srcdir}"
-      "${TRY_COMPILE_PROJECT_NAME}"
+      PROJECT "${TRY_COMPILE_PROJECT_NAME}"
+      SOURCE_DIR "${srcdir}"
+      BINARY_DIR "${bindir}"
       CMAKE_FLAGS
       "-DCMAKE_VERBOSE_MAKEFILE=ON"
       "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON"
+      ${_CMAKE_LANG_FLAGS}
       OUTPUT_VARIABLE output
   )
   set(_IPO_LANGUAGE_CHECK_RESULT "${_IPO_LANGUAGE_CHECK_RESULT}")
@@ -155,6 +174,11 @@ function(check_ipo_supported)
     message(FATAL_ERROR "Policy CMP0069 set to OLD")
   endif()
 
+  # Save policy setting for condition in _ipo_run_language_check.
+  cmake_policy(GET CMP0138 ipo_CMP0138
+    PARENT_SCOPE # undocumented, do not use outside of CMake
+    )
+
   set(optional)
   set(one RESULT OUTPUT)
   set(multiple LANGUAGES)
@@ -193,6 +217,11 @@ function(check_ipo_supported)
       list(APPEND languages "C")
     endif()
 
+    list(FIND enabled_languages "CUDA" result)
+    if(NOT result EQUAL -1)
+      list(APPEND languages "CUDA")
+    endif()
+
     list(FIND enabled_languages "Fortran" result)
     if(NOT result EQUAL -1)
       list(APPEND languages "Fortran")
@@ -201,7 +230,7 @@ function(check_ipo_supported)
     string(COMPARE EQUAL "${languages}" "" no_languages)
     if(no_languages)
       _ipo_not_supported(
-          "no C/CXX/Fortran languages found in ENABLED_LANGUAGES global property"
+          "no C/CXX/CUDA/Fortran languages found in ENABLED_LANGUAGES global property"
       )
       return()
     endif()
@@ -209,7 +238,7 @@ function(check_ipo_supported)
     set(languages "${X_LANGUAGES}")
 
     set(unsupported_languages "${languages}")
-    list(REMOVE_ITEM unsupported_languages "C" "CXX" "Fortran")
+    list(REMOVE_ITEM unsupported_languages "C" "CXX" "CUDA" "Fortran")
     string(COMPARE NOTEQUAL "${unsupported_languages}" "" has_unsupported)
     if(has_unsupported)
       _ipo_not_supported(
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/CMakeLists-C.txt.in b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/CMakeLists-C.txt.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/CMakeLists-C.txt.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/CMakeLists-C.txt.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/CMakeLists-CXX.txt.in b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/CMakeLists-CXX.txt.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/CMakeLists-CXX.txt.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/CMakeLists-CXX.txt.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/CMakeLists-Fortran.txt.in b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/CMakeLists-Fortran.txt.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/CMakeLists-Fortran.txt.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/CMakeLists-Fortran.txt.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/foo.c b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/foo.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/foo.c
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/foo.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/foo.cpp b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/foo.cpp
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/foo.cpp
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/foo.cpp
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/foo.f b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/foo.f
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/foo.f
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/foo.f
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/main.c b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/main.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/main.c
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/main.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/main.cpp b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/main.cpp
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/main.cpp
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/main.cpp
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/main.f b/deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/main.f
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIPOSupported/main.f
rename to deps/cmake/share/cmake-3.25/Modules/CheckIPOSupported/main.f
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFile.c.in b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFile.c.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIncludeFile.c.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckIncludeFile.c.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFile.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFile.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIncludeFile.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckIncludeFile.cmake
index 71ddde7f..4cba91b3 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFile.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFile.cmake
@@ -54,8 +54,8 @@ macro(CHECK_INCLUDE_FILE INCLUDE VARIABLE)
     endif()
     set(MACRO_CHECK_INCLUDE_FILE_FLAGS ${CMAKE_REQUIRED_FLAGS})
     set(CHECK_INCLUDE_FILE_VAR ${INCLUDE})
-    configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.c.in
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.c)
+    file(READ ${CMAKE_ROOT}/Modules/CheckIncludeFile.c.in _CIF_SOURCE_CONTENT)
+    string(CONFIGURE "${_CIF_SOURCE_CONTENT}" _CIF_SOURCE_CONTENT)
     if(NOT CMAKE_REQUIRED_QUIET)
       message(CHECK_START "Looking for ${INCLUDE}")
     endif()
@@ -93,8 +93,7 @@ macro(CHECK_INCLUDE_FILE INCLUDE VARIABLE)
     endif()
 
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.c
+      SOURCE_FROM_VAR CheckIncludeFile.c _CIF_SOURCE_CONTENT
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${_CIF_LINK_OPTIONS}
       ${_CIF_LINK_LIBRARIES}
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFile.cxx.in b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFile.cxx.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIncludeFile.cxx.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckIncludeFile.cxx.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFileCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFileCXX.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIncludeFileCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckIncludeFileCXX.cmake
index 953224e7..f6af0369 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFileCXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFileCXX.cmake
@@ -53,8 +53,8 @@ macro(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
     endif()
     set(MACRO_CHECK_INCLUDE_FILE_FLAGS ${CMAKE_REQUIRED_FLAGS})
     set(CHECK_INCLUDE_FILE_VAR ${INCLUDE})
-    configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
+    file(READ ${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in _CIF_SOURCE_CONTENT)
+    string(CONFIGURE "${_CIF_SOURCE_CONTENT}" _CIF_SOURCE_CONTENT)
     if(NOT CMAKE_REQUIRED_QUIET)
       message(CHECK_START "Looking for C++ include ${INCLUDE}")
     endif()
@@ -92,8 +92,7 @@ macro(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE)
     endif()
 
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
+      SOURCE_FROM_VAR CheckIncludeFile.cxx _CIF_SOURCE_CONTENT
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${_CIF_LINK_OPTIONS}
       ${_CIF_LINK_LIBRARIES}
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFiles.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFiles.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/CheckIncludeFiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckIncludeFiles.cmake
index 1800ca88..8fc6921c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckIncludeFiles.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckIncludeFiles.cmake
@@ -52,7 +52,7 @@ include_guard(GLOBAL)
 
 macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
   if(NOT DEFINED "${VARIABLE}")
-    set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
+    set(_src_content "/* */\n")
 
     if("x${ARGN}" STREQUAL "x")
        if(CMAKE_C_COMPILER_LOADED)
@@ -70,10 +70,11 @@ macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
       message(FATAL_ERROR "Unknown arguments:\n  ${ARGN}\n")
     endif()
 
+    string(MAKE_C_IDENTIFIER ${VARIABLE} _variable_escaped)
     if(_lang STREQUAL "C")
-      set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckIncludeFiles/${VARIABLE}.c)
+      set(src ${_variable_escaped}.c)
     elseif(_lang STREQUAL "CXX")
-      set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckIncludeFiles/${VARIABLE}.cpp)
+      set(src ${_variable_escaped}.cpp)
     else()
       message(FATAL_ERROR "Unknown language:\n  ${_lang}\nSupported languages: C, CXX.\n")
     endif()
@@ -86,13 +87,11 @@ macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
     set(CHECK_INCLUDE_FILES_CONTENT "/* */\n")
     set(MACRO_CHECK_INCLUDE_FILES_FLAGS ${CMAKE_REQUIRED_FLAGS})
     foreach(FILE ${INCLUDE})
-      string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
+      string(APPEND _src_content
         "#include <${FILE}>\n")
     endforeach()
-    string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
+    string(APPEND _src_content
       "\n\nint main(void){return 0;}\n")
-    configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
-      "${src}" @ONLY)
 
     set(_INCLUDE ${INCLUDE}) # remove empty elements
     if("${_INCLUDE}" MATCHES "^([^;]+);.+;([^;]+)$")
@@ -136,8 +135,7 @@ macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
       message(CHECK_START "Looking for ${_description}")
     endif()
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${src}
+      SOURCE_FROM_VAR "${src}" _src_content
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${_CIF_LINK_OPTIONS}
       ${_CIF_LINK_LIBRARIES}
@@ -164,7 +162,7 @@ macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
         "Determining if files ${INCLUDE} "
         "exist failed with the following output:\n"
-        "${OUTPUT}\nSource:\n${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+        "${OUTPUT}\nSource:\n${_src_content}\n")
     endif()
   endif()
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckLanguage.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckLanguage.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/CheckLanguage.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckLanguage.cmake
index 928881ca..52f707c0 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckLanguage.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckLanguage.cmake
@@ -36,6 +36,9 @@ Example:
 
 include_guard(GLOBAL)
 
+cmake_policy(PUSH)
+cmake_policy(SET CMP0126 NEW)
+
 macro(check_language lang)
   if(NOT DEFINED CMAKE_${lang}_COMPILER)
     set(_desc "Looking for a ${lang} compiler")
@@ -43,7 +46,7 @@ macro(check_language lang)
     file(REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/Check${lang})
 
     set(extra_compiler_variables)
-    if(${lang} STREQUAL CUDA)
+    if(${lang} STREQUAL CUDA AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
       set(extra_compiler_variables "set(CMAKE_CUDA_HOST_COMPILER \\\"\${CMAKE_CUDA_HOST_COMPILER}\\\")")
     endif()
 
@@ -110,3 +113,5 @@ file(WRITE \"\${CMAKE_CURRENT_BINARY_DIR}/result.cmake\"
 
   endif()
 endmacro()
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckLibraryExists.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckLibraryExists.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/CheckLibraryExists.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckLibraryExists.cmake
index 804e0cbb..56424ac2 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckLibraryExists.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckLibraryExists.cmake
@@ -61,17 +61,15 @@ macro(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE)
     endif()
 
     if(CMAKE_C_COMPILER_LOADED)
-      set(_cle_source ${CMAKE_ROOT}/Modules/CheckFunctionExists.c)
+      set(_cle_source CheckFunctionExists.c)
     elseif(CMAKE_CXX_COMPILER_LOADED)
-      set(_cle_source ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckLibraryExists/CheckFunctionExists.cxx)
-      configure_file(${CMAKE_ROOT}/Modules/CheckFunctionExists.c "${_cle_source}" COPYONLY)
+      set(_cle_source CheckFunctionExists.cxx)
     else()
       message(FATAL_ERROR "CHECK_FUNCTION_EXISTS needs either C or CXX language enabled")
     endif()
 
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${_cle_source}
+      SOURCE_FROM_FILE "${_cle_source}" "${CMAKE_ROOT}/Modules/CheckFunctionExists.c"
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${CHECK_LIBRARY_EXISTS_LINK_OPTIONS}
       LINK_LIBRARIES ${CHECK_LIBRARY_EXISTS_LIBRARIES}
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckLibraryExists.lists.in b/deps/cmake/share/cmake-3.25/Modules/CheckLibraryExists.lists.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckLibraryExists.lists.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckLibraryExists.lists.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckLinkerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckLinkerFlag.cmake
similarity index 53%
rename from deps/cmake/share/cmake-3.21/Modules/CheckLinkerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckLinkerFlag.cmake
index 28ac2e32..83192162 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckLinkerFlag.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckLinkerFlag.cmake
@@ -38,47 +38,8 @@ effect or even a specific one is beyond the scope of this module.
 #]=======================================================================]
 
 include_guard(GLOBAL)
-
-include(CMakeCheckCompilerFlagCommonPatterns)
+include(Internal/CheckLinkerFlag)
 
 function(CHECK_LINKER_FLAG _lang _flag _var)
-  get_property (_supported_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
-  if (NOT _lang IN_LIST _supported_languages)
-    message (SEND_ERROR "check_linker_flag: ${_lang}: unknown language.")
-    return()
-  endif()
-
-  include (CheckSourceCompiles)
-
-  set(CMAKE_REQUIRED_LINK_OPTIONS "${_flag}")
-
-  # Normalize locale during test compilation.
-  set(_locale_vars LC_ALL LC_MESSAGES LANG)
-  foreach(v IN LISTS _locale_vars)
-    set(_locale_vars_saved_${v} "$ENV{${v}}")
-    set(ENV{${v}} C)
-  endforeach()
-
-  if (_lang MATCHES "^(C|CXX)$")
-    set (_source "int main() { return 0; }")
-  elseif (_lang STREQUAL "Fortran")
-    set (_source "       program test\n       stop\n       end program")
-  elseif (_lang MATCHES "CUDA")
-    set (_source "__host__ int main() { return 0; }")
-  elseif (_lang MATCHES "HIP")
-    set (_source "__host__ int main() { return 0; }")
-  elseif (_lang MATCHES "^(OBJC|OBJCXX)$")
-    set (_source "#ifndef __OBJC__\n#  error \"Not an Objective-C++ compiler\"\n#endif\nint main(void) { return 0; }")
-  else()
-    message (SEND_ERROR "check_linker_flag: ${_lang}: unsupported language.")
-    return()
-  endif()
-  check_compiler_flag_common_patterns(_common_patterns)
-
-  check_source_compiles(${_lang} "${_source}" ${_var} ${_common_patterns})
-
-  foreach(v IN LISTS _locale_vars)
-    set(ENV{${v}} ${_locale_vars_saved_${v}})
-  endforeach()
-  set(${_var} "${${_var}}" PARENT_SCOPE)
+  cmake_check_linker_flag(${_lang} "${_flag}" ${_var})
 endfunction()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckOBJCCompilerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckOBJCCompilerFlag.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckOBJCCompilerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckOBJCCompilerFlag.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckOBJCSourceCompiles.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckOBJCSourceCompiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckOBJCSourceCompiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckOBJCSourceCompiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckOBJCSourceRuns.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckOBJCSourceRuns.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckOBJCSourceRuns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckOBJCSourceRuns.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckOBJCXXCompilerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckOBJCXXCompilerFlag.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckOBJCXXCompilerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckOBJCXXCompilerFlag.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckOBJCXXSourceCompiles.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckOBJCXXSourceCompiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckOBJCXXSourceCompiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckOBJCXXSourceCompiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckOBJCXXSourceRuns.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckOBJCXXSourceRuns.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckOBJCXXSourceRuns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckOBJCXXSourceRuns.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckPIESupported.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckPIESupported.cmake
similarity index 74%
rename from deps/cmake/share/cmake-3.21/Modules/CheckPIESupported.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckPIESupported.cmake
index fb878224..452348bf 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckPIESupported.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckPIESupported.cmake
@@ -22,10 +22,19 @@ property for executables will be honored at link time.
   Options are:
 
   ``OUTPUT_VARIABLE <output>``
-    Set ``<output>`` variable with details about any error.
+    Set ``<output>`` variable with details about any error. If the check is
+    bypassed because it uses cached results from a previous call, the output
+    will be empty even if errors were present in the previous call.
+
   ``LANGUAGES <lang>...``
     Check the linkers used for each of the specified languages.
-    Supported languages are ``C``, ``CXX``, and ``Fortran``.
+    If this option is not provided, the command checks all enabled languages.
+
+    ``C``, ``CXX``, ``Fortran`` are supported.
+
+    .. versionadded:: 3.23
+
+      ``OBJC``, ``OBJCXX``, ``CUDA``, and ``HIP`` are supported.
 
 It makes no sense to use this module when :policy:`CMP0083` is set to ``OLD``,
 so the command will return an error in this case.  See policy :policy:`CMP0083`
@@ -37,9 +46,9 @@ Variables
 For each language checked, two boolean cache variables are defined.
 
  ``CMAKE_<lang>_LINK_PIE_SUPPORTED``
-   Set to ``YES`` if ``PIE`` is supported by the linker and ``NO`` otherwise.
+   Set to true if ``PIE`` is supported by the linker and false otherwise.
  ``CMAKE_<lang>_LINK_NO_PIE_SUPPORTED``
-   Set to ``YES`` if ``NO_PIE`` is supported by the linker and ``NO`` otherwise.
+   Set to true if ``NO_PIE`` is supported by the linker and false otherwise.
 
 Examples
 ^^^^^^^^
@@ -62,7 +71,7 @@ Examples
 #]=======================================================================]
 
 
-include (Internal/CMakeTryCompilerOrLinkerFlag)
+include (Internal/CheckLinkerFlag)
 
 function (check_pie_supported)
   cmake_policy(GET CMP0083 cmp0083)
@@ -86,7 +95,7 @@ function (check_pie_supported)
 
   if (CHECK_PIE_LANGUAGES)
     set (unsupported_languages "${CHECK_PIE_LANGUAGES}")
-    list (REMOVE_ITEM unsupported_languages "C" "CXX" "Fortran")
+    list (REMOVE_ITEM unsupported_languages "C" "CXX" "OBJC" "OBJCXX" "Fortran" "CUDA" "HIP")
     if(unsupported_languages)
       message(FATAL_ERROR "check_pie_supported: language(s) '${unsupported_languages}' not supported")
     endif()
@@ -97,7 +106,7 @@ function (check_pie_supported)
       return()
     endif()
 
-    list (FILTER enabled_languages INCLUDE REGEX "^(C|CXX|Fortran)$")
+    list (FILTER enabled_languages INCLUDE REGEX "^(C|CXX|OBJC|OBJCXX|Fortran|CUDA|HIP)$")
     if (NOT enabled_languages)
       return()
     endif()
@@ -105,30 +114,35 @@ function (check_pie_supported)
     set (CHECK_PIE_LANGUAGES ${enabled_languages})
   endif()
 
+  set(CMAKE_REQUIRED_QUIET TRUE)
   set (outputs)
 
   foreach(lang IN LISTS CHECK_PIE_LANGUAGES)
     if(_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER)
-      cmake_try_compiler_or_linker_flag(${lang}
+      if(NOT DEFINED CMAKE_${lang}_LINK_PIE_SUPPORTED)
+        cmake_check_linker_flag(${lang}
                                 "${CMAKE_${lang}_LINK_OPTIONS_PIE}"
                                 CMAKE_${lang}_LINK_PIE_SUPPORTED
                                 OUTPUT_VARIABLE output)
-      if (NOT CMAKE_${lang}_LINK_PIE_SUPPORTED)
-        string (APPEND outputs "PIE (${lang}): ${output}\n")
+        if (NOT CMAKE_${lang}_LINK_PIE_SUPPORTED)
+          string (APPEND outputs "PIE (${lang}): ${output}\n")
+        endif()
       endif()
 
-      cmake_try_compiler_or_linker_flag(${lang}
+      if(NOT DEFINED CMAKE_${lang}_LINK_NO_PIE_SUPPORTED)
+        cmake_check_linker_flag(${lang}
                                 "${CMAKE_${lang}_LINK_OPTIONS_NO_PIE}"
                                 CMAKE_${lang}_LINK_NO_PIE_SUPPORTED
                                 OUTPUT_VARIABLE output)
-      if (NOT CMAKE_${lang}_LINK_NO_PIE_SUPPORTED)
-        string (APPEND outputs "NO_PIE (${lang}): ${output}\n")
+        if (NOT CMAKE_${lang}_LINK_NO_PIE_SUPPORTED)
+          string (APPEND outputs "NO_PIE (${lang}): ${output}\n")
+        endif()
       endif()
     else()
       # no support at link time. Set cache variables to NO
       set(CMAKE_${lang}_LINK_PIE_SUPPORTED NO CACHE INTERNAL "PIE (${lang})")
       set(CMAKE_${lang}_LINK_NO_PIE_SUPPORTED NO CACHE INTERNAL "NO_PIE (${lang})")
-      string (APPEND outputs "PIE and NO_PIE are not supported by linker for ${lang}")
+      string (APPEND outputs "PIE and NO_PIE are not supported by linker for ${lang}\n")
     endif()
   endforeach()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckPrototypeDefinition.c.in b/deps/cmake/share/cmake-3.25/Modules/CheckPrototypeDefinition.c.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckPrototypeDefinition.c.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckPrototypeDefinition.c.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckPrototypeDefinition.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckPrototypeDefinition.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/CheckPrototypeDefinition.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckPrototypeDefinition.cmake
index d29c5e89..12f4e868 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckPrototypeDefinition.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckPrototypeDefinition.cmake
@@ -94,14 +94,11 @@ function(check_prototype_definition _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIAB
     set(CHECK_PROTOTYPE_DEFINITION_PROTO ${_PROTOTYPE})
     set(CHECK_PROTOTYPE_DEFINITION_RETURN ${_RETURN})
 
-    configure_file("${__check_proto_def_dir}/CheckPrototypeDefinition.c.in"
-      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c" @ONLY)
-
-    file(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c _SOURCE)
+    file(READ ${__check_proto_def_dir}/CheckPrototypeDefinition.c.in _SOURCE)
+    string(CONFIGURE "${_SOURCE}" _SOURCE @ONLY)
 
     try_compile(${_VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c
+      SOURCE_FROM_VAR CheckPrototypeDefinition.c _SOURCE
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${CHECK_PROTOTYPE_DEFINITION_LINK_OPTIONS}
       ${CHECK_PROTOTYPE_DEFINITION_LIBS}
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckSizeOf.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckSizeOf.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckSizeOf.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckSizeOf.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckSourceCompiles.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckSourceCompiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckSourceCompiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckSourceCompiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckSourceRuns.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckSourceRuns.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckSourceRuns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckSourceRuns.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckStructHasMember.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckStructHasMember.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckStructHasMember.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckStructHasMember.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckSymbolExists.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckSymbolExists.cmake
similarity index 80%
rename from deps/cmake/share/cmake-3.21/Modules/CheckSymbolExists.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckSymbolExists.cmake
index f8ca5840..0d44d565 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckSymbolExists.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckSymbolExists.cmake
@@ -24,7 +24,7 @@ available and assumed to work.  If the header files declare the symbol
 as a function or variable then the symbol must also be available for
 linking (so intrinsics may not be detected).
 If the symbol is a type, enum value, or intrinsic it will not be recognized
-(consider using :module:`CheckTypeSize` or :module:`CheckCSourceCompiles`).
+(consider using :module:`CheckTypeSize` or :module:`CheckSourceCompiles`).
 If the check needs to be done in C++, consider using
 :module:`CheckCXXSymbolExists` instead.
 
@@ -67,17 +67,32 @@ cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
 
 macro(CHECK_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
   if(CMAKE_C_COMPILER_LOADED)
-    __CHECK_SYMBOL_EXISTS_IMPL("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.c" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+    __CHECK_SYMBOL_EXISTS_FILTER_FLAGS(C)
+    __CHECK_SYMBOL_EXISTS_IMPL(CheckSymbolExists.c "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+    __CHECK_SYMBOL_EXISTS_RESTORE_FLAGS(C)
   elseif(CMAKE_CXX_COMPILER_LOADED)
-    __CHECK_SYMBOL_EXISTS_IMPL("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+    __CHECK_SYMBOL_EXISTS_FILTER_FLAGS(CXX)
+    __CHECK_SYMBOL_EXISTS_IMPL(CheckSymbolExists.cxx "${SYMBOL}" "${FILES}" "${VARIABLE}" )
+    __CHECK_SYMBOL_EXISTS_RESTORE_FLAGS(CXX)
   else()
     message(FATAL_ERROR "CHECK_SYMBOL_EXISTS needs either C or CXX language enabled")
   endif()
 endmacro()
 
+macro(__CHECK_SYMBOL_EXISTS_FILTER_FLAGS LANG)
+    set(__CMAKE_${LANG}_FLAGS_SAVED "${CMAKE_${LANG}_FLAGS}")
+    string(REGEX REPLACE "(^| )-Werror([= ][^ ]*)?( |$)" " " CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS}")
+    string(REGEX REPLACE "(^| )-pedantic-errors( |$)" " " CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS}")
+endmacro()
+
+macro(__CHECK_SYMBOL_EXISTS_RESTORE_FLAGS LANG)
+    set(CMAKE_${LANG}_FLAGS "${__CMAKE_${LANG}_FLAGS_SAVED}")
+    unset(__CMAKE_${LANG}_FLAGS_SAVED)
+endmacro()
+
 macro(__CHECK_SYMBOL_EXISTS_IMPL SOURCEFILE SYMBOL FILES VARIABLE)
   if(NOT DEFINED "${VARIABLE}" OR "x${${VARIABLE}}" STREQUAL "x${VARIABLE}")
-    set(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
+    set(_CSE_SOURCE "/* */\n")
     set(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
     if(CMAKE_REQUIRED_LINK_OPTIONS)
       set(CHECK_SYMBOL_EXISTS_LINK_OPTIONS
@@ -98,17 +113,17 @@ macro(__CHECK_SYMBOL_EXISTS_IMPL SOURCEFILE SYMBOL FILES VARIABLE)
       set(CMAKE_SYMBOL_EXISTS_INCLUDES)
     endif()
     foreach(FILE ${FILES})
-      string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT
+      string(APPEND _CSE_SOURCE
         "#include <${FILE}>\n")
     endforeach()
-    string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT "
+    string(APPEND _CSE_SOURCE "
 int main(int argc, char** argv)
 {
   (void)argv;")
     set(_CSE_CHECK_NON_MACRO "return ((int*)(&${SYMBOL}))[argc];")
     if("${SYMBOL}" MATCHES "^[a-zA-Z_][a-zA-Z0-9_]*$")
       # The SYMBOL has a legal macro name.  Test whether it exists as a macro.
-      string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT "
+      string(APPEND _CSE_SOURCE "
 #ifndef ${SYMBOL}
   ${_CSE_CHECK_NON_MACRO}
 #else
@@ -117,22 +132,18 @@ int main(int argc, char** argv)
 #endif")
     else()
       # The SYMBOL cannot be a macro (e.g., a template function).
-      string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT "
+      string(APPEND _CSE_SOURCE "
   ${_CSE_CHECK_NON_MACRO}")
     endif()
-    string(APPEND CMAKE_CONFIGURABLE_FILE_CONTENT "
+    string(APPEND _CSE_SOURCE "
 }")
     unset(_CSE_CHECK_NON_MACRO)
 
-    configure_file("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
-      "${SOURCEFILE}" @ONLY)
-
     if(NOT CMAKE_REQUIRED_QUIET)
       message(CHECK_START "Looking for ${SYMBOL}")
     endif()
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      "${SOURCEFILE}"
+      SOURCE_FROM_VAR "${SOURCEFILE}" _CSE_SOURCE
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${CHECK_SYMBOL_EXISTS_LINK_OPTIONS}
       ${CHECK_SYMBOL_EXISTS_LIBS}
@@ -149,7 +160,7 @@ int main(int argc, char** argv)
         "Determining if the ${SYMBOL} "
         "exist passed with the following output:\n"
         "${OUTPUT}\nFile ${SOURCEFILE}:\n"
-        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+        "${_CSE_SOURCE}\n")
     else()
       if(NOT CMAKE_REQUIRED_QUIET)
         message(CHECK_FAIL "not found")
@@ -159,9 +170,9 @@ int main(int argc, char** argv)
         "Determining if the ${SYMBOL} "
         "exist failed with the following output:\n"
         "${OUTPUT}\nFile ${SOURCEFILE}:\n"
-        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+        "${_CSE_SOURCE}\n")
     endif()
-    unset(CMAKE_CONFIGURABLE_FILE_CONTENT)
+    unset(_CSE_SOURCE)
   endif()
 endmacro()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckTypeSize.c.in b/deps/cmake/share/cmake-3.25/Modules/CheckTypeSize.c.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckTypeSize.c.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckTypeSize.c.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckTypeSize.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckTypeSize.cmake
similarity index 79%
rename from deps/cmake/share/cmake-3.21/Modules/CheckTypeSize.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckTypeSize.cmake
index 69f68f9d..e09b7c84 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckTypeSize.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckTypeSize.cmake
@@ -7,46 +7,53 @@ CheckTypeSize
 
 Check sizeof a type
 
-.. command:: CHECK_TYPE_SIZE
+.. command:: check_type_size
 
   .. code-block:: cmake
 
-    CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY]
-                                  [LANGUAGE <language>])
+    check_type_size(<type> <variable> [BUILTIN_TYPES_ONLY]
+                                      [LANGUAGE <language>])
 
-  Check if the type exists and determine its size.  On return,
-  ``HAVE_${VARIABLE}`` holds the existence of the type, and ``${VARIABLE}``
-  holds one of the following:
+  Check if the type exists and determine its size.  Results are reported
+  in the following variables:
 
-  ::
+  ``HAVE_<variable>``
+    Holds a true or false value indicating whether the type exists.
 
-     <size> = type has non-zero size <size>
-     "0"    = type has arch-dependent size (see below)
-     ""     = type does not exist
+  ``<variable>``
+    Holds one of the following values:
 
-  Both ``HAVE_${VARIABLE}`` and ``${VARIABLE}`` will be created as internal
-  cache variables.
+    ``<size>``
+       Type has non-zero size ``<size>``.
 
-  Furthermore, the variable ``${VARIABLE}_CODE`` holds C preprocessor code
-  to define the macro ``${VARIABLE}`` to the size of the type, or leave
-  the macro undefined if the type does not exist.
+    ``0``
+       Type has architecture-dependent size.  This may occur when
+       :variable:`CMAKE_OSX_ARCHITECTURES` has multiple architectures.
+       In this case ``<variable>_CODE`` contains C preprocessor tests
+       mapping from each architecture macro to the corresponding type size.
+       The list of architecture macros is stored in ``<variable>_KEYS``,
+       and the value for each key is stored in ``<variable>-<key>``.
 
-  The variable ``${VARIABLE}`` may be ``0`` when
-  :variable:`CMAKE_OSX_ARCHITECTURES` has multiple architectures for building
-  OS X universal binaries.  This indicates that the type size varies across
-  architectures.  In this case ``${VARIABLE}_CODE`` contains C preprocessor
-  tests mapping from each architecture macro to the corresponding type size.
-  The list of architecture macros is stored in ``${VARIABLE}_KEYS``, and the
-  value for each key is stored in ``${VARIABLE}-${KEY}``.
+    "" (empty string)
+       Type does not exist.
 
-  If the ``BUILTIN_TYPES_ONLY`` option is not given, the macro checks for
-  headers ``<sys/types.h>``, ``<stdint.h>``, and ``<stddef.h>``, and saves
-  results in ``HAVE_SYS_TYPES_H``, ``HAVE_STDINT_H``, and ``HAVE_STDDEF_H``.
-  The type size check automatically includes the available headers, thus
-  supporting checks of types defined in the headers.
+  ``<variable>_CODE``
+    Holds C preprocessor code to define the macro ``<variable>`` to the size
+    of the type, or to leave the macro undefined if the type does not exist.
 
-  If ``LANGUAGE`` is set, the specified compiler will be used to perform the
-  check. Acceptable values are ``C`` and ``CXX``.
+  The options are:
+
+  ``BUILTIN_TYPES_ONLY``
+
+    Support only compiler-builtin types.  If *not* given, the macro checks
+    for headers ``<sys/types.h>``, ``<stdint.h>``, and ``<stddef.h>``, and
+    saves results in ``HAVE_SYS_TYPES_H``, ``HAVE_STDINT_H``, and
+    ``HAVE_STDDEF_H``.  The type size check automatically includes the
+    available headers, thus supporting checks of types defined in the headers.
+
+  ``LANGUAGE <language>``
+    Use the ``<language>`` compiler to perform the check.
+    Acceptable values are ``C`` and ``CXX``.
 
 Despite the name of the macro you may use it to check the size of more
 complex expressions, too.  To check e.g.  for the size of a struct
@@ -96,10 +103,11 @@ function(__check_type_size_impl type var map builtin language)
   endif()
 
   # Perform language check
+  string(MAKE_C_IDENTIFIER ${var} _var_escaped)
   if(language STREQUAL "C")
-    set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
+    set(src ${_var_escaped}.c)
   elseif(language STREQUAL "CXX")
-    set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.cpp)
+    set(src ${_var_escaped}.cpp)
   else()
     message(FATAL_ERROR "Unknown language:\n  ${language}\nSupported languages: C, CXX.\n")
   endif()
@@ -135,8 +143,9 @@ function(__check_type_size_impl type var map builtin language)
 
   # Perform the check.
   set(bin ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.bin)
-  configure_file(${__check_type_size_dir}/CheckTypeSize.c.in ${src} @ONLY)
-  try_compile(HAVE_${var} ${CMAKE_BINARY_DIR} ${src}
+  file(READ ${__check_type_size_dir}/CheckTypeSize.c.in src_content)
+  string(CONFIGURE "${src_content}" src_content @ONLY)
+  try_compile(HAVE_${var} SOURCE_FROM_VAR "${src}" src_content
     COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
     LINK_OPTIONS ${CMAKE_REQUIRED_LINK_OPTIONS}
     LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}
@@ -202,9 +211,8 @@ function(__check_type_size_impl type var map builtin language)
     if(NOT CMAKE_REQUIRED_QUIET)
       message(CHECK_FAIL "failed")
     endif()
-    file(READ ${src} content)
     file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-      "Determining size of ${type} failed with the following output:\n${output}\n${src}:\n${content}\n\n")
+      "Determining size of ${type} failed with the following output:\n${output}\n${src}:\n${src_content}\n\n")
     set(${var} "" CACHE INTERNAL "CHECK_TYPE_SIZE: ${type} unknown")
     file(REMOVE ${map})
   endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckTypeSizeMap.cmake.in b/deps/cmake/share/cmake-3.25/Modules/CheckTypeSizeMap.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckTypeSizeMap.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/CheckTypeSizeMap.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckVariableExists.c b/deps/cmake/share/cmake-3.25/Modules/CheckVariableExists.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CheckVariableExists.c
rename to deps/cmake/share/cmake-3.25/Modules/CheckVariableExists.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/CheckVariableExists.cmake b/deps/cmake/share/cmake-3.25/Modules/CheckVariableExists.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CheckVariableExists.cmake
rename to deps/cmake/share/cmake-3.25/Modules/CheckVariableExists.cmake
index 7420124f..5dc34412 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CheckVariableExists.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/CheckVariableExists.cmake
@@ -62,8 +62,7 @@ macro(CHECK_VARIABLE_EXISTS VAR VARIABLE)
       set(CHECK_VARIABLE_EXISTS_ADD_LIBRARIES)
     endif()
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_ROOT}/Modules/CheckVariableExists.c
+      SOURCES ${CMAKE_ROOT}/Modules/CheckVariableExists.c
       COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
       ${CHECK_VARIABLE_EXISTS_ADD_LINK_OPTIONS}
       ${CHECK_VARIABLE_EXISTS_ADD_LIBRARIES}
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-C.cmake
new file mode 100644
index 00000000..cef3fb1a
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-C.cmake
@@ -0,0 +1,11 @@
+include(Compiler/CMakeCommonCompilerMacros)
+include(Compiler/ADSP)
+
+__compiler_adsp(C)
+
+set(CMAKE_C90_STANDARD_COMPILE_OPTION -c89)
+set(CMAKE_C90_STANDARD__HAS_FULL_SUPPORT ON)
+
+set(CMAKE_C99_STANDARD__HAS_FULL_SUPPORT ON)
+
+__compiler_check_default_language_standard(C 8.0.0.0 99)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-CXX.cmake
new file mode 100644
index 00000000..b01cab1f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-CXX.cmake
@@ -0,0 +1,16 @@
+include(Compiler/CMakeCommonCompilerMacros)
+include(Compiler/ADSP)
+
+__compiler_adsp(CXX)
+
+set(CMAKE_CXX98_STANDARD_COMPILE_OPTION -c++)
+set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -g++)
+set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON)
+
+if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.3.0.0)
+  set(CMAKE_CXX11_STANDARD_COMPILE_OPTION -c++11)
+  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -c++11 -g++)
+  set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
+endif()
+
+__compiler_check_default_language_standard(CXX 8.0.0.0 98)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-DetermineCompiler.cmake
new file mode 100644
index 00000000..96c88f91
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP-DetermineCompiler.cmake
@@ -0,0 +1,11 @@
+
+set(_compiler_id_pp_test "defined(_ADI_COMPILER)")
+
+set(_compiler_id_version_compute "
+#if defined(__VERSIONNUM__)
+  /* __VERSIONNUM__ = 0xVVRRPPTT */
+#  define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__VERSIONNUM__ >> 24 & 0xFF)
+#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__VERSIONNUM__ >> 16 & 0xFF)
+#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__VERSIONNUM__ >> 8 & 0xFF)
+#  define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__VERSIONNUM__ & 0xFF)
+#endif")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP.cmake
new file mode 100644
index 00000000..62566a07
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/ADSP.cmake
@@ -0,0 +1,26 @@
+include_guard()
+
+set(CMAKE_EXECUTABLE_SUFFIX ".dxe")
+
+macro(__compiler_adsp lang)
+  set(CMAKE_${lang}_OUTPUT_EXTENSION ".doj")
+
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-flags-link" " ")
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP ",")
+
+  set(_CMAKE_${lang}_ADSP_FLAGS "-proc=${CMAKE_ADSP_PROCESSOR}")
+
+  set(CMAKE_${lang}_COMPILE_OBJECT
+    "<CMAKE_${lang}_COMPILER> ${_CMAKE_${lang}_ADSP_FLAGS} <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
+
+  set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
+    "<CMAKE_${lang}_COMPILER> ${_CMAKE_${lang}_ADSP_FLAGS} -build-lib -o <TARGET> <CMAKE_${lang}_LINK_FLAGS> <OBJECTS>")
+
+  set(CMAKE_${lang}_LINK_EXECUTABLE
+    "<CMAKE_${lang}_COMPILER> ${_CMAKE_${lang}_ADSP_FLAGS} <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+
+  unset(_CMAKE_${lang}_ADSP_FLAGS)
+
+  set(CMAKE_${lang}_CREATE_SHARED_LIBRARY)
+  set(CMAKE_${lang}_CREATE_MODULE_LIBRARY)
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMCC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMCC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-C.cmake
similarity index 64%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-C.cmake
index 0a64a8a4..01c4cea0 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-C.cmake
@@ -2,6 +2,14 @@ include(Compiler/Clang-C)
 include(Compiler/ARMClang)
 __compiler_armclang(C)
 
+if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+    AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+    AND CMAKE_DEPFILE_FLAGS_C)
+  # dependencies are computed by the compiler itself
+  set(CMAKE_C_DEPFILE_FORMAT gcc)
+  set(CMAKE_C_DEPENDS_USE_COMPILER TRUE)
+endif()
+
 set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
 set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
 set(CMAKE_C90_STANDARD__HAS_FULL_SUPPORT ON)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-CXX.cmake
new file mode 100644
index 00000000..045b7831
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-CXX.cmake
@@ -0,0 +1,11 @@
+include(Compiler/Clang-CXX)
+include(Compiler/ARMClang)
+__compiler_armclang(CXX)
+
+if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+    AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+    AND CMAKE_DEPFILE_FLAGS_CXX)
+  # dependencies are computed by the compiler itself
+  set(CMAKE_CXX_DEPFILE_FORMAT gcc)
+  set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE)
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/ARMClang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/ARMClang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Absoft-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Absoft-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Absoft-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Absoft-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-CXX.cmake
similarity index 83%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-CXX.cmake
index 28be1dfd..7c979697 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-CXX.cmake
@@ -47,9 +47,17 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
     set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
 endif()
 
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
+  set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++20")
+  set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++20")
+elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
   set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++2a")
   set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++2a")
 endif()
 
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
+  set(CMAKE_CXX23_STANDARD_COMPILE_OPTION "-std=c++2b")
+  set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-std=gnu++2b")
+endif()
+
 __compiler_check_default_language_standard(CXX 4.0 98)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-OBJC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-OBJC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-OBJC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-OBJC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-OBJCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-OBJCXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/AppleClang-OBJCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/AppleClang-OBJCXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Borland-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Borland-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Borland-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Borland-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Bruce-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Bruce-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Bruce-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Bruce-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Bruce-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Bruce-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/CCur-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/CCur-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/CCur-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/CCur-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/CMakeCommonCompilerMacros.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/CMakeCommonCompilerMacros.cmake
similarity index 89%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/CMakeCommonCompilerMacros.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/CMakeCommonCompilerMacros.cmake
index c86af98f..2f220d46 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/CMakeCommonCompilerMacros.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/CMakeCommonCompilerMacros.cmake
@@ -38,20 +38,26 @@ macro(__compiler_check_default_language_standard lang stdver1 std1)
   # support for language standards, then don't bother.
   if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL "${stdver1}")
     if (NOT CMAKE_${lang}_COMPILER_FORCED)
-      if (NOT CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT)
-        message(FATAL_ERROR "CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_${lang}_COMPILER_ID} (${CMAKE_${lang}_COMPILER}) version ${CMAKE_${lang}_COMPILER_VERSION}")
+      if (NOT CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT OR NOT DEFINED CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT)
+        message(FATAL_ERROR "CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT and CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT should be set for ${CMAKE_${lang}_COMPILER_ID} (${CMAKE_${lang}_COMPILER}) version ${CMAKE_${lang}_COMPILER_VERSION}")
       endif ()
       set(CMAKE_${lang}_STANDARD_DEFAULT ${CMAKE_${lang}_STANDARD_COMPUTED_DEFAULT})
+      set(CMAKE_${lang}_EXTENSIONS_DEFAULT ${CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT})
     else ()
       list(REVERSE __std_ver_pairs)
       foreach (__std_ver_pair IN LISTS __std_ver_pairs)
         string(REGEX MATCH "([^ ]+) (.+)" __std_ver_pair "${__std_ver_pair}")
         set(__stdver ${CMAKE_MATCH_1})
         set(__std ${CMAKE_MATCH_2})
-        if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL __stdver AND
-          NOT DEFINED CMAKE_${lang}_STANDARD_DEFAULT)
-          # Compiler id was forced so just guess the default standard level.
-          set(CMAKE_${lang}_STANDARD_DEFAULT ${__std})
+        # Compiler id was forced so just guess the defaults.
+        if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL __stdver)
+          if(NOT DEFINED CMAKE_${lang}_EXTENSIONS_DEFAULT)
+            # Currently known compilers default to enabling extensions.
+            set(CMAKE_${lang}_EXTENSIONS_DEFAULT ON)
+          endif()
+          if(NOT DEFINED CMAKE_${lang}_STANDARD_DEFAULT)
+            set(CMAKE_${lang}_STANDARD_DEFAULT ${__std})
+          endif()
         endif ()
         unset(__std)
         unset(__stdver)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-C.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-C.cmake
index cf493d72..1b765ad1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-C.cmake
@@ -9,6 +9,7 @@ endif()
 if("x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
   set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -TC)
   set(CMAKE_C_CLANG_TIDY_DRIVER_MODE "cl")
+  set(CMAKE_C_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
   if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
       AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
       AND CMAKE_DEPFILE_FLAGS_C)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CUDA.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CUDA.cmake
similarity index 80%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CUDA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CUDA.cmake
index 0223081d..d9929f1f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CUDA.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CUDA.cmake
@@ -18,8 +18,13 @@ __compiler_clang_cxx_standards(CUDA)
 
 set(CMAKE_CUDA_COMPILER_HAS_DEVICE_LINK_PHASE TRUE)
 set(_CMAKE_COMPILE_AS_CUDA_FLAG "-x cuda")
+set(_CMAKE_CUDA_WHOLE_FLAG "-c")
+set(_CMAKE_CUDA_RDC_FLAG "-fgpu-rdc")
 set(_CMAKE_CUDA_PTX_FLAG "--cuda-device-only -S")
-set(_CMAKE_CUDA_DEVICE_CODE "-fgpu-rdc -c")
+
+# Device linking is just regular linking so these are the same.
+set(CMAKE_CUDA_DEVICE_LINKER_WRAPPER_FLAG ${CMAKE_CUDA_LINKER_WRAPPER_FLAG})
+set(CMAKE_CUDA_DEVICE_LINKER_WRAPPER_FLAG_SEP ${CMAKE_CUDA_LINKER_WRAPPER_FLAG_SEP})
 
 # RulePlaceholderExpander expands crosscompile variables like sysroot and target only for CMAKE_<LANG>_COMPILER. Override the default.
 set(CMAKE_CUDA_LINK_EXECUTABLE "<CMAKE_CUDA_COMPILER> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>${__IMPLICIT_LINKS}")
@@ -30,6 +35,10 @@ set(CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_STATIC "cudadevrt;cudart_static")
 set(CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_SHARED "cudadevrt;cudart")
 set(CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_NONE   "")
 
+# Clang doesn't support CUDA device LTO
+set(_CMAKE_CUDA_IPO_SUPPORTED_BY_CMAKE NO)
+set(_CMAKE_CUDA_IPO_MAY_BE_SUPPORTED_BY_COMPILER NO)
+
 if(UNIX)
   list(APPEND CMAKE_CUDA_RUNTIME_LIBRARY_LINK_OPTIONS_STATIC "rt" "pthread" "dl")
 endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CXX-TestableFeatures.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CXX.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CXX.cmake
index 98828e01..84b05d7f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-CXX.cmake
@@ -22,6 +22,7 @@ endif()
 
 if("x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
   set(CMAKE_CXX_CLANG_TIDY_DRIVER_MODE "cl")
+  set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
   if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
       AND CMAKE_GENERATOR MATCHES "Makefiles"
       AND CMAKE_DEPFILE_FLAGS_CXX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-DetermineCompilerInternal.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-FindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-FindBinUtils.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-FindBinUtils.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-FindBinUtils.cmake
index e6c469a1..125ae788 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-FindBinUtils.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-FindBinUtils.cmake
@@ -28,6 +28,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
     "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar-${__version_x}"
     "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar"
     HINTS ${__clang_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
     DOC "LLVM archiver"
 )
 mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
@@ -38,6 +39,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
     "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib-${__version_x}"
     "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib"
     HINTS ${__clang_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
     DOC "Generate index for LLVM archive"
 )
 mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-HIP.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-HIP.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-HIP.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-HIP.cmake
index 1030a43c..4dbe2e8c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-HIP.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-HIP.cmake
@@ -15,6 +15,6 @@ set(CMAKE_HIP_RUNTIME_LIBRARY_DEFAULT "SHARED")
 set(CMAKE_HIP_RUNTIME_LIBRARY_LINK_OPTIONS_STATIC  "")
 set(CMAKE_HIP_RUNTIME_LIBRARY_LINK_OPTIONS_SHARED  "")
 
-# Populated by CMakeHIPRuntime.cmake
+# Populated by CMakeHIPInformation.cmake
 set(CMAKE_HIP_RUNTIME_LIBRARIES_STATIC "")
 set(CMAKE_HIP_RUNTIME_LIBRARIES_SHARED "")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-OBJC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-OBJC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-OBJC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-OBJC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-OBJCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-OBJCXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang-OBJCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang-OBJCXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Clang.cmake
index f885eb02..4f9af371 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Clang.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Clang.cmake
@@ -80,7 +80,7 @@ else()
       set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto")
     endif()
 
-    if(ANDROID AND NOT CMAKE_ANDROID_NDK_VERSION VERSION_GREATER_EQUAL "22")
+    if(ANDROID AND CMAKE_ANDROID_NDK_VERSION VERSION_LESS "22")
       # https://github.com/android-ndk/ndk/issues/242
       set(CMAKE_${lang}_LINK_OPTIONS_IPO "-fuse-ld=gold")
     endif()
@@ -114,6 +114,12 @@ else()
     endif()
     set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -Xclang -include-pch -Xclang <PCH_FILE> -Xclang -include -Xclang <PCH_HEADER>)
     set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -Xclang -emit-pch -Xclang -include -Xclang <PCH_HEADER> -x ${__pch_header_${lang}})
+
+    # '-fcolor-diagnostics' introduced since Clang 2.6
+    if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 2.6)
+      set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS "-fcolor-diagnostics")
+      set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF "-fno-color-diagnostics")
+    endif()
   endmacro()
 endif()
 
@@ -249,6 +255,7 @@ macro(__compiler_clang_cxx_standards lang)
         cxx_std_17
         cxx_std_20
         cxx_std_23
+        cxx_std_26
         )
       _record_compiler_features(${lang} "" CMAKE_${lang}_COMPILE_FEATURES)
     endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Compaq-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Compaq-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Cray-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Cray-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Cray.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Cray.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Cray.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Cray.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/CrayPrgEnv.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/CrayPrgEnv.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Embarcadero-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Flang-FindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Flang-FindBinUtils.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Flang-FindBinUtils.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Flang-FindBinUtils.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Flang-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Flang-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Flang-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Flang-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu.cmake
index 78495cb9..55c2aa48 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Fujitsu.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Fujitsu.cmake
@@ -11,6 +11,7 @@ include(Compiler/CMakeCommonCompilerMacros)
 
 macro(__compiler_fujitsu lang)
   set(CMAKE_${lang}_VERBOSE_FLAG "-###")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-cwno")
 
   # Initial configuration flags
   string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-FindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-FindBinUtils.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang-FindBinUtils.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang-FindBinUtils.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/FujitsuClang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/FujitsuClang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/G95-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/G95-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/G95-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/G95-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GHS-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GHS-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GHS-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GHS-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GHS-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GHS-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GHS-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GHS-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GHS-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GHS-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GHS-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GHS-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GHS.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GHS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GHS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GHS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-FindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-FindBinUtils.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-FindBinUtils.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-FindBinUtils.cmake
index 097fbf3a..4dcdd537 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-FindBinUtils.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-FindBinUtils.cmake
@@ -20,6 +20,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
     "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x}"
     "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${_CMAKE_COMPILER_SUFFIX}"
     HINTS ${__gcc_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
     DOC "A wrapper around 'ar' adding the appropriate '--plugin' option for the GCC compiler"
 )
 mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
@@ -30,6 +31,7 @@ find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
     "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x}"
     "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib${_CMAKE_COMPILER_SUFFIX}"
     HINTS ${__gcc_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
     DOC "A wrapper around 'ranlib' adding the appropriate '--plugin' option for the GCC compiler"
 )
 mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-OBJC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-OBJC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-OBJC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-OBJC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-OBJCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-OBJCXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU-OBJCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU-OBJCXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU.cmake
similarity index 81%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/GNU.cmake
index 928e7263..48639cd6 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/GNU.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/GNU.cmake
@@ -18,6 +18,7 @@ set(__pch_header_OBJCXX "objective-c++-header")
 macro(__compiler_gnu lang)
   # Feature flags.
   set(CMAKE_${lang}_VERBOSE_FLAG "-v")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror")
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
   set (_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER NO)
   if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.4)
@@ -71,7 +72,25 @@ macro(__compiler_gnu lang)
   # * https://gcc.gnu.org/onlinedocs/gcc-4.5.4/gcc/Option-Summary.html (yes)
   if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.5)
     set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
-    set(__lto_flags -flto)
+
+    set(__lto_flags "")
+
+    # '-flto=auto' introduced since GCC 10.1:
+    # * https://gcc.gnu.org/onlinedocs/gcc-9.5.0/gcc/Optimize-Options.html#Optimize-Options (no)
+    # * https://gcc.gnu.org/onlinedocs/gcc-10.1.0/gcc/Optimize-Options.html#Optimize-Options (yes)
+    # Since GCC 12.1, the abundance of a parameter produces a warning if compiling multiple targets.
+    # FIXME: What version of GCC for Windows added support for -flto=auto?  10.3 does not have it.
+    if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 11.0)
+      list(APPEND __lto_flags -flto=auto)
+    elseif(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 10.1)
+      if (CMAKE_HOST_WIN32)
+        list(APPEND __lto_flags -flto=1)
+      else()
+        list(APPEND __lto_flags -flto=auto)
+      endif()
+    else()
+      list(APPEND __lto_flags -flto)
+    endif()
 
     if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4.7)
       # '-ffat-lto-objects' introduced since GCC 4.7:
@@ -119,4 +138,11 @@ macro(__compiler_gnu lang)
     set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -include <PCH_HEADER>)
     set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -x ${__pch_header_${lang}} -include <PCH_HEADER>)
   endif()
+
+  # '-fdiagnostics-color=always' introduced since GCC 4.9
+  # https://gcc.gnu.org/gcc-4.9/changes.html
+  if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 4.9)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS "-fdiagnostics-color=always")
+    set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF "-fno-diagnostics-color")
+  endif()
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/HP-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/HP-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/HP-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/HP-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/HP-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/HP-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/HP-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/HP-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/HP-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/HP-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/HP-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/HP-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/HP-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/HP-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/HP-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/HP-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/HP-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/HP-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/HP-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/HP-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/HP-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/HP-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/HP-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/HP-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-ASM.cmake
new file mode 100644
index 00000000..bae0fbd8
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-ASM.cmake
@@ -0,0 +1,45 @@
+# This file is processed when the IAR Assembler is used
+
+include(Compiler/IAR)
+
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
+set(_CMAKE_IAR_ITOOLS "ARM" "RH850"  "RL78" "RX" "RISC-V" "STM8")
+set(_CMAKE_IAR_XTOOLS "AVR" "MSP430" "V850" "8051")
+
+set(_CMAKE_IAR_ASM_SILENT   "RH850"  "RL78" "RX" "RISC-V" "STM8")
+if("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" IN_LIST _CMAKE_IAR_ASM_SILENT)
+  set(_CMAKE_IAR_SILENCER_FLAG " --silent")
+else()
+  set(_CMAKE_IAR_SILENCER_FLAG " -S")
+endif()
+
+string(APPEND CMAKE_ASM_FLAGS_INIT " ")
+string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -r")
+string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
+string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -DNDEBUG")
+string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -r -DNDEBUG")
+
+set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${_CMAKE_IAR_SILENCER_FLAG} <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
+
+if("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" IN_LIST _CMAKE_IAR_ITOOLS)
+  __compiler_iar_ilink(ASM)
+  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;asm;msa;S)
+
+elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" IN_LIST _CMAKE_IAR_XTOOLS)
+  __compiler_iar_xlink(ASM)
+  # AVR=s90, MSP430=s43, V850=s85, 8051=s51
+  set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s90;s43;s85;s51;asm;msa)
+
+else()
+  message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID not detected. This should be automatic.")
+
+endif()
+
+unset(_CMAKE_IAR_ITOOLS)
+unset(_CMAKE_IAR_XTOOLS)
+unset(_CMAKE_IAR_ASM_SILENT)
+unset(_CMAKE_IAR_SILENCER_FLAG)
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-C.cmake
similarity index 61%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-C.cmake
index 054ee74c..0ef1a2a8 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-C.cmake
@@ -1,54 +1,61 @@
-# This file is processed when the IAR compiler is used for a C file
-
+# This file is processed when the IAR C Compiler is used
+#
+# C Language Specification support
+#  - Newer versions of the IAR C Compiler require the --c89 flag to build a file under the C90 standard.
+#  - Earlier versions of the compiler had C90 by default, not requiring the backward-compatibility flag.
+#
+# The IAR Language Extensions
+#  - The IAR Language Extensions can be enabled by -e flag
+#
 include(Compiler/IAR)
 include(Compiler/CMakeCommonCompilerMacros)
 
-# Common
-if(NOT CMAKE_C_COMPILER_VERSION)
+if(NOT DEFINED CMAKE_C_COMPILER_VERSION)
   message(FATAL_ERROR "CMAKE_C_COMPILER_VERSION not detected.  This should be automatic.")
 endif()
 
+# Unused after CMP0128
 set(CMAKE_C_EXTENSION_COMPILE_OPTION -e)
 
 if(CMAKE_C_COMPILER_VERSION_INTERNAL VERSION_GREATER 7)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION --c89)
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION --c89 -e)
-  set(CMAKE_C99_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_C99_EXTENSION_COMPILE_OPTION -e)
 else()
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
   set(CMAKE_C90_EXTENSION_COMPILE_OPTION -e)
 endif()
 
-if(CMAKE_C_COMPILER_VERSION_INTERNAL VERSION_GREATER 8)
-  set(CMAKE_C11_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_C11_EXTENSION_COMPILE_OPTION -e)
-endif()
+set(CMAKE_C${CMAKE_C_STANDARD_COMPUTED_DEFAULT}_STANDARD_COMPILE_OPTION "")
+set(CMAKE_C${CMAKE_C_STANDARD_COMPUTED_DEFAULT}_EXTENSION_COMPILE_OPTION -e)
 
 # Architecture specific
 if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM")
-  if(CMAKE_C_COMPILER_VERSION_INTERNAL VERSION_LESS 7)
-    # IAR ARM 4.X uses xlink.exe, detection is not yet implemented
-    message(FATAL_ERROR "CMAKE_C_COMPILER_VERSION = ${CMAKE_C_COMPILER_VERSION} not supported by CMake.")
+  if (CMAKE_C_COMPILER_VERSION VERSION_LESS 5)
+    # IAR C Compiler for Arm prior version 5.xx uses XLINK. Support in CMake is not implemented.
+    message(FATAL_ERROR "IAR C Compiler for Arm version ${CMAKE_C_COMPILER_VERSION} not supported by CMake.")
   endif()
   __compiler_iar_ilink(C)
-  __compiler_check_default_language_standard(C 1.10 90 6.10 99 8.10 11)
+  __compiler_check_default_language_standard(C 5.10 90 6.10 99 8.10 11 8.40 17)
 
 elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RX")
   __compiler_iar_ilink(C)
-  __compiler_check_default_language_standard(C 1.10 90 2.10 99 4.10 11)
+  __compiler_check_default_language_standard(C 1.10 90 2.10 99 4.10 11 4.20 17)
 
 elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RH850")
   __compiler_iar_ilink(C)
-  __compiler_check_default_language_standard(C 1.10 90 1.10 99 2.10 11)
+  __compiler_check_default_language_standard(C 1.10 90 1.10 99 2.10 11 2.21 17)
 
 elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RL78")
+  if(CMAKE_C_COMPILER_VERSION VERSION_LESS 2)
+    # IAR C Compiler for RL78 prior version 2.xx uses XLINK. Support in CMake is not implemented.
+    message(FATAL_ERROR "IAR C Compiler for RL78 version ${CMAKE_C_COMPILER_VERSION} not supported by CMake.")
+  endif()
   __compiler_iar_ilink(C)
-  __compiler_check_default_language_standard(C 1.10 90 1.10 99 4.10 11)
+  __compiler_check_default_language_standard(C 2.10 90 2.10 99 4.10 11 4.20 17)
 
 elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "RISCV")
   __compiler_iar_ilink(C)
-  __compiler_check_default_language_standard(C 1.10 90 1.10 99 1.10 11)
+  __compiler_check_default_language_standard(C 1.10 90 1.10 99 1.10 11 1.21 17)
 
 elseif("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR")
   __compiler_iar_xlink(C)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-CXX.cmake
similarity index 51%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-CXX.cmake
index d93b2728..3f0ef1f3 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-CXX.cmake
@@ -1,63 +1,70 @@
-# This file is processed when the IAR compiler is used for a C++ file
-
+# This file is processed when the IAR C++ Compiler is used
+#
+# C++ Language Specification support
+#  - Newer versions of the IAR C++ Compiler require the --c++ flag to build a C++ file.
+#    Earlier versions for non-ARM architectures provided Embedded C++, enabled with the --eec++ flag.
+#
+# The IAR Language Extensions
+#  - The IAR Language Extensions can be enabled by -e flag
+#
 include(Compiler/IAR)
 include(Compiler/CMakeCommonCompilerMacros)
 
-# Common
-if(NOT CMAKE_CXX_COMPILER_VERSION)
+if(NOT DEFINED CMAKE_CXX_COMPILER_VERSION)
   message(FATAL_ERROR "CMAKE_CXX_COMPILER_VERSION not detected. This should be automatic.")
 endif()
 
+# Whenever needed, override this default behavior using CMAKE_IAR_CXX_FLAG in your toolchain file.
 if(NOT CMAKE_IAR_CXX_FLAG)
-  # The --c++ flag was introduced in platform version 9 for all architectures except ARM where it was introduced already in version 7
-  if(CMAKE_CXX_COMPILER_VERSION_INTERNAL VERSION_GREATER 8 OR
-    (CMAKE_CXX_COMPILER_VERSION_INTERNAL VERSION_GREATER 6 AND "${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") )
+  cmake_policy(PUSH)
+  cmake_policy(SET CMP0057 NEW) # if IN_LIST
+
+  set(_CMAKE_IAR_MODERNCXX_LIST 14 17)
+  if(${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} IN_LIST _CMAKE_IAR_MODERNCXX_LIST OR
+     ("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM" AND ${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT} EQUAL 98))
     set(CMAKE_IAR_CXX_FLAG --c++)
   else()
     set(CMAKE_IAR_CXX_FLAG --eec++)
   endif()
+  unset(_CMAKE_IAR_MODERNCXX_LIST)
+
+  cmake_policy(POP)
 endif()
 
-set(CMAKE_CXX_EXTENSION_COMPILE_OPTION -e)
+set(CMAKE_CXX_STANDARD_COMPILE_OPTION "")
+set(CMAKE_CXX_EXTENSION_COMPILE_OPTION -e) # Unused after CMP0128
 
-if(CMAKE_CXX_COMPILER_VERSION_INTERNAL VERSION_GREATER 7)
-  set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION -e)
-  set(CMAKE_CXX03_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_CXX03_EXTENSION_COMPILE_OPTION -e)
-endif()
-
-if(CMAKE_CXX_COMPILER_VERSION_INTERNAL VERSION_GREATER 8)
-  set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -e)
-  set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "")
-  set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION -e)
-endif()
+set(CMAKE_CXX${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT}_STANDARD_COMPILE_OPTION "")
+set(CMAKE_CXX${CMAKE_CXX_STANDARD_COMPUTED_DEFAULT}_EXTENSION_COMPILE_OPTION -e)
 
 # Architecture specific
 if("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM")
-  if(CMAKE_CXX_COMPILER_VERSION_INTERNAL VERSION_LESS 7)
-    # IAR ARM 4.X uses xlink.exe, detection is not yet implemented
-    message(FATAL_ERROR "CMAKE_CXX_COMPILER_VERSION = ${CMAKE_C_COMPILER_VERSION} not supported by CMake.")
+  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
+    # IAR C++ Compiler for Arm prior version 5.xx uses XLINK. Support in CMake is not implemented.
+    message(FATAL_ERROR "IAR C++ Compiler for Arm version ${CMAKE_CXX_COMPILER_VERSION} not supported by CMake.")
   endif()
   __compiler_iar_ilink(CXX)
-  __compiler_check_default_language_standard(CXX 6.10 98 8.10 14)
+  __compiler_check_default_language_standard(CXX 5.10 98 8.10 14 8.40 17)
 
 elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RX")
   __compiler_iar_ilink(CXX)
-  __compiler_check_default_language_standard(CXX 2.10 98 4.10 14)
+  __compiler_check_default_language_standard(CXX 2.10 98 4.10 14 4.20 17)
 
 elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RH850")
   __compiler_iar_ilink(CXX)
-  __compiler_check_default_language_standard(CXX 1.10 98 2.10 14)
+  __compiler_check_default_language_standard(CXX 1.10 98 2.10 14 2.21 17)
 
 elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RL78")
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2)
+    # # IAR C++ Compiler for RL78 prior version 2.xx uses XLINK. Support in CMake is not implemented.
+    message(FATAL_ERROR "IAR C++ Compiler for RL78 version ${CMAKE_CXX_COMPILER_VERSION} not supported by CMake.")
+  endif()
   __compiler_iar_ilink(CXX)
-  __compiler_check_default_language_standard(CXX 1.10 98 4.10 14)
+  __compiler_check_default_language_standard(CXX 2.10 98 4.10 14 4.20 17)
 
 elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "RISCV")
   __compiler_iar_ilink(CXX)
-  __compiler_check_default_language_standard(CXX 1.10 98 1.10 14)
+  __compiler_check_default_language_standard(CXX 1.10 98 1.10 14 1.21 17)
 
 elseif("${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "AVR")
   __compiler_iar_xlink(CXX)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-DetermineCompiler.cmake
new file mode 100644
index 00000000..b03fd1fa
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR-DetermineCompiler.cmake
@@ -0,0 +1,37 @@
+# IAR C/C++ Compiler (https://www.iar.com)
+# CPU <arch> supported in CMake: 8051, Arm, AVR, MSP430, RH850, RISC-V, RL78, RX and V850
+#
+# IAR C/C++ Compiler for <arch> internal integer symbols used in CMake:
+#
+# __IAR_SYSTEMS_ICC__
+#           Provides the compiler internal platform version
+# __ICC<arch>__
+#           Provides 1 for the current <arch> in use
+# __VER__
+#           Provides the current version in use
+#            The semantic version of the compiler is architecture-dependent
+#            When <arch> is ARM:
+#               CMAKE_<LANG>_COMPILER_VERSION_MAJOR = (__VER__ / 1E6)
+#               CMAKE_<LANG>_COMPILER_VERSION_MINOR = (__VER__ / 1E3) % 1E3
+#               CMAKE_<LANG>_COMPILER_VERSION_PATCH = (__VER__ % 1E3)
+#            When <arch> is non-ARM:
+#               CMAKE_<LANG>_COMPILER_VERSION_MAJOR = (__VER__ / 1E2)
+#               CMAKE_<LANG>_COMPILER_VERSION_MINOR = (__VER__ - ((__VER__/ 1E2) * 1E2))
+#               CMAKE_<LANG>_COMPILER_VERSION_PATCH = (__SUBVERSION__)
+# __SUBVERSION__
+#           Provides the version's patch level for non-ARM <arch>
+#
+set(_compiler_id_pp_test "defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)")
+
+set(_compiler_id_version_compute "
+# if defined(__VER__) && defined(__ICCARM__)
+#  define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@((__VER__) / 1000000)
+#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(((__VER__) / 1000) % 1000)
+#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@((__VER__) % 1000)
+#  define @PREFIX@COMPILER_VERSION_INTERNAL @MACRO_DEC@(__IAR_SYSTEMS_ICC__)
+# elif defined(__VER__) && (defined(__ICCAVR__) || defined(__ICCRX__) || defined(__ICCRH850__) || defined(__ICCRL78__) || defined(__ICC430__) || defined(__ICCRISCV__) || defined(__ICCV850__) || defined(__ICC8051__) || defined(__ICCSTM8__))
+#  define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@((__VER__) / 100)
+#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@((__VER__) - (((__VER__) / 100)*100))
+#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__SUBVERSION__)
+#  define @PREFIX@COMPILER_VERSION_INTERNAL @MACRO_DEC@(__IAR_SYSTEMS_ICC__)
+# endif")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR.cmake
similarity index 53%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IAR.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IAR.cmake
index 2200a21a..53456f5c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IAR.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IAR.cmake
@@ -1,47 +1,15 @@
-# This file is processed when the IAR compiler is used for a C or C++ file
-# Documentation can be downloaded here: http://www.iar.com/website1/1.0.1.0/675/1/
-# The initial feature request is here: https://gitlab.kitware.com/cmake/cmake/-/issues/10176
-# It also contains additional links and information.
-# See USER GUIDES -> C/C++ Development Guide and ReleaseNotes for EWARM:
-# version 6.30.8: http://supp.iar.com/FilesPublic/UPDINFO/006607/arm/doc/infocenter/index.ENU.html
-# version 7.60.1: http://supp.iar.com/FilesPublic/UPDINFO/011006/arm/doc/infocenter/index.ENU.html
-# version 8.10.1: http://netstorage.iar.com/SuppDB/Public/UPDINFO/011854/arm/doc/infocenter/index.ENU.html
-
-# The IAR internal compiler platform generations (Predefined symbol __IAR_SYSTEMS_ICC__):
-#  9 and higher means C11 and C++14 as language default (EWARM v8.x, EWRX v4.x and higher)
-#  8 means C99 and C++03 as language default (EWARM v6.x, v7.x. EWRX v2.x, 3.x)
-#  7 and lower means C89 and EC++ as language default. (EWARM v5.x and lower)
-
-# C/C++ Standard versions
+# This file is processed when the IAR C/C++ Compiler is used
 #
-# IAR typically only supports one C and C++ Standard version,
-# the exception is C89 which is always supported and can be selected
-# if its not the default
+# CPU <arch> supported in CMake: 8051, Arm, AVR, MSP430, RH850, RISC-V, RL78, RX and V850
 #
-# C++ is trickier, there were historically 3 switches,
-# and some IAR versions support multiple of those.
-# they are --eec++, --ec++ and --c++ and where used to
-# enable various language features like exceptions
+# The compiler user documentation is architecture-dependent
+# and it can found with the product installation under <arch>/doc/{EW,BX}<arch>_DevelopmentGuide.ENU.pdf
 #
-# recent versions only have --c++ for full support
-# but can choose to disable features with further arguments
 #
-# C/C++ Standard compliance
-#
-# IAR has 3 modes: default, strict and extended
-# the extended mode is needed for popular libraries like CMSIS
-#
-# "Silent" Operation
-#
-# this really is different to most programs I know.
-# nothing meaningful from the operation is lost, just some redundant
-# code and data size printouts (that can be inspected with common tools).
-
-# This module is shared by multiple languages; use include blocker.
 include_guard()
 
 macro(__compiler_iar_ilink lang)
-  set(CMAKE_EXECUTABLE_SUFFIX_${lang} ".elf")
+  set(CMAKE_EXECUTABLE_SUFFIX ".elf")
   set(CMAKE_${lang}_OUTPUT_EXTENSION ".o")
   if (${lang} STREQUAL "C" OR ${lang} STREQUAL "CXX")
     set(CMAKE_${lang}_COMPILE_OBJECT             "<CMAKE_${lang}_COMPILER> ${CMAKE_IAR_${lang}_FLAG} --silent <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
@@ -58,14 +26,6 @@ macro(__compiler_iar_ilink lang)
     string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -Oh -r -DNDEBUG")
   endif()
 
-  if (${lang} STREQUAL "ASM")
-    string(APPEND CMAKE_ASM_FLAGS_INIT " ")
-    string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -r")
-    string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
-    string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -DNDEBUG")
-    string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -r -DNDEBUG")
-  endif()
-
   set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_LINKER> --silent <OBJECTS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> -o <TARGET>")
   set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_AR> <TARGET> --create <LINK_FLAGS> <OBJECTS>")
   set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> <TARGET> --create <LINK_FLAGS> <OBJECTS>")
@@ -74,7 +34,7 @@ macro(__compiler_iar_ilink lang)
 endmacro()
 
 macro(__compiler_iar_xlink lang)
-  set(CMAKE_EXECUTABLE_SUFFIX_${lang} ".bin")
+  set(CMAKE_EXECUTABLE_SUFFIX ".bin")
   if (${lang} STREQUAL "C" OR ${lang} STREQUAL "CXX")
 
     set(CMAKE_${lang}_COMPILE_OBJECT             "<CMAKE_${lang}_COMPILER> ${CMAKE_IAR_${lang}_FLAG} --silent <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>")
@@ -91,14 +51,6 @@ macro(__compiler_iar_xlink lang)
     string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -Oh -r -DNDEBUG")
   endif()
 
-  if (${lang} STREQUAL "ASM")
-    string(APPEND CMAKE_ASM_FLAGS_INIT " ")
-    string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -r")
-    string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
-    string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -DNDEBUG")
-    string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -r -DNDEBUG")
-  endif()
-
   set(CMAKE_${lang}_LINK_EXECUTABLE "<CMAKE_LINKER> -S <OBJECTS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> -o <TARGET>")
   set(CMAKE_${lang}_CREATE_STATIC_LIBRARY "<CMAKE_AR> <TARGET> <LINK_FLAGS> <OBJECTS>")
   set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> <TARGET> <LINK_FLAGS> <OBJECTS>")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-ASM.cmake
new file mode 100644
index 00000000..dffc085f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-ASM.cmake
@@ -0,0 +1,5 @@
+include(Compiler/IBMClang)
+
+set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;S;asm)
+
+__compiler_ibmclang(ASM)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake
new file mode 100644
index 00000000..623c8af5
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake
@@ -0,0 +1,8 @@
+set(_compiler_id_pp_test "defined(__open_xl__) && defined(__clang__)")
+
+set(_compiler_id_version_compute "
+# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__open_xl_version__)
+# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__open_xl_release__)
+# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__open_xl_modification__)
+# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__open_xl_ptf_fix_level__)
+")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-C.cmake
new file mode 100644
index 00000000..b69b1b80
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-C.cmake
@@ -0,0 +1,30 @@
+include(Compiler/IBMClang)
+__compiler_ibmclang(C)
+
+set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c)
+
+if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+    AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+    AND CMAKE_DEPFILE_FLAGS_C)
+  # dependencies are computed by the compiler itself
+  set(CMAKE_C_DEPFILE_FORMAT gcc)
+  set(CMAKE_C_DEPENDS_USE_COMPILER TRUE)
+endif()
+
+set(CMAKE_C90_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
+set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
+
+set(CMAKE_C99_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
+set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
+
+set(CMAKE_C11_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11")
+set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
+
+if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 17.1.0)
+  set(CMAKE_C17_STANDARD_COMPILE_OPTION  "-std=c17")
+  set(CMAKE_C17_EXTENSION_COMPILE_OPTION "-std=gnu17")
+endif ()
+__compiler_check_default_language_standard(C 17.1.0 17)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake
new file mode 100644
index 00000000..623c8af5
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake
@@ -0,0 +1,8 @@
+set(_compiler_id_pp_test "defined(__open_xl__) && defined(__clang__)")
+
+set(_compiler_id_version_compute "
+# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__open_xl_version__)
+# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__open_xl_release__)
+# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__open_xl_modification__)
+# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__open_xl_ptf_fix_level__)
+")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-CXX.cmake
new file mode 100644
index 00000000..5431b17e
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang-CXX.cmake
@@ -0,0 +1,39 @@
+include(Compiler/IBMClang)
+__compiler_ibmclang(CXX)
+
+if("x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+  if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+      AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+      AND CMAKE_DEPFILE_FLAGS_CXX)
+    # dependencies are computed by the compiler itself
+    set(CMAKE_CXX_DEPFILE_FORMAT gcc)
+    set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE)
+  endif()
+
+  set(CMAKE_CXX_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c++)
+  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
+endif()
+
+set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
+set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
+
+set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
+set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
+
+set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
+set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17.1.0)
+  set(CMAKE_CXX17_STANDARD_COMPILE_OPTION  "-std=c++17")
+  set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
+  set(CMAKE_CXX20_STANDARD_COMPILE_OPTION  "-std=c++20")
+  set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++20")
+endif()
+
+__compiler_check_default_language_standard(CXX 17.1.0 17)
+
+set(CMAKE_CXX_COMPILE_OBJECT
+  "<CMAKE_CXX_COMPILER> -x c++ <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang.cmake
new file mode 100644
index 00000000..9ed7658b
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IBMClang.cmake
@@ -0,0 +1,79 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# This module is shared by multiple languages; use include blocker.
+if(__COMPILER_IBMClang)
+  return()
+endif()
+set(__COMPILER_IBMClang 1)
+
+include(Compiler/CMakeCommonCompilerMacros)
+
+set(__pch_header_C "c-header")
+set(__pch_header_CXX "c++-header")
+set(__pch_header_OBJC "objective-c-header")
+set(__pch_header_OBJCXX "objective-c++-header")
+
+include(Compiler/GNU)
+
+macro(__compiler_ibmclang lang)
+  __compiler_gnu(${lang})
+
+  # Feature flags.
+  set(CMAKE_${lang}_VERBOSE_FLAG "-v")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIC")
+  set(CMAKE_${lang}_RESPONSE_FILE_FLAG "@")
+  set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "@")
+
+  set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+
+  set(CMAKE_${lang}_COMPILE_OPTIONS_TARGET "--target=")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN "--gcc-toolchain=")
+
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-Xlinker" " ")
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP)
+
+  if(CMAKE_${lang}_COMPILER_TARGET)
+    list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "--target=${CMAKE_${lang}_COMPILER_TARGET}")
+  endif()
+
+  set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES)
+  set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
+
+  set(_CMAKE_LTO_THIN TRUE)
+
+  if(_CMAKE_LTO_THIN)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto=thin")
+  else()
+    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto")
+  endif()
+
+  set(__ar "${CMAKE_${lang}_COMPILER_AR}")
+  set(__ranlib "${CMAKE_${lang}_COMPILER_RANLIB}")
+
+  set(CMAKE_${lang}_ARCHIVE_CREATE_IPO
+    "\"${__ar}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>"
+  )
+
+  set(CMAKE_${lang}_ARCHIVE_APPEND_IPO
+    "\"${__ar}\" r <TARGET> <LINK_FLAGS> <OBJECTS>"
+  )
+
+  set(CMAKE_${lang}_ARCHIVE_FINISH_IPO
+    "\"${__ranlib}\" <TARGET>"
+  )
+
+  list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp")
+
+  set(CMAKE_PCH_EXTENSION .pch)
+
+  set(CMAKE_PCH_PROLOGUE "#pragma clang system_header")
+
+  set(CMAKE_${lang}_COMPILE_OPTIONS_INSTANTIATE_TEMPLATES_PCH -fpch-instantiate-templates)
+
+  set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -Xclang -include-pch -Xclang <PCH_FILE> -Xclang -include -Xclang <PCH_HEADER>)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -Xclang -emit-pch -Xclang -include -Xclang <PCH_HEADER> -x ${__pch_header_${lang}})
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-C.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-C.cmake
index ead9069f..9884b58c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-C.cmake
@@ -17,6 +17,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
 
   set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -TC)
   set(CMAKE_C_CLANG_TIDY_DRIVER_MODE "cl")
+  set(CMAKE_C_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
 
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 16.0.0)
     set(CMAKE_C11_STANDARD_COMPILE_OPTION "-Qstd=c11")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-CXX.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-CXX.cmake
index 37f339a7..7c9cca97 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-CXX.cmake
@@ -16,6 +16,7 @@ endif()
 if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
 
   set(CMAKE_CXX_CLANG_TIDY_DRIVER_MODE "cl")
+  set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
 
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.0.0)
     set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-Qstd=c++20")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-ISPC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-ISPC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel-ISPC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel-ISPC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel.cmake
similarity index 79%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Intel.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Intel.cmake
index 9a760c8f..642e58a6 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/Intel.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Intel.cmake
@@ -13,6 +13,11 @@ include(Compiler/CMakeCommonCompilerMacros)
 if(CMAKE_HOST_WIN32)
   # MSVC-like
   macro(__compiler_intel lang)
+    if("x${lang}" STREQUAL "xFortran")
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-warn:errors")
+    else()
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror-all")
+    endif()
   endmacro()
 else()
   # GNU-like
@@ -33,7 +38,9 @@ else()
     endif()
     list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "-QdM" "-P" "-Za" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp")
 
-    if(NOT "x${lang}" STREQUAL "xFortran")
+    if("x${lang}" STREQUAL "xFortran")
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-warn" "errors")
+    else()
       # Precompile Headers
       set(CMAKE_PCH_EXTENSION .pchi)
       set(CMAKE_LINK_PCH ON)
@@ -41,6 +48,9 @@ else()
       set(CMAKE_${lang}_COMPILE_OPTIONS_INVALID_PCH -Winvalid-pch)
       set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -Wno-pch-messages -pch-use <PCH_FILE> -include <PCH_HEADER>)
       set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -Wno-pch-messages -pch-create <PCH_FILE> -include <PCH_HEADER>)
+
+      # COMPILE_WARNING_AS_ERROR
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror-all")
     endif()
   endmacro()
 endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-C.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-C.cmake
index d69d0647..d7346f62 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-C.cmake
@@ -4,6 +4,7 @@ __compiler_intel_llvm(C)
 if("x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
   set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -TC)
   set(CMAKE_C_CLANG_TIDY_DRIVER_MODE "cl")
+  set(CMAKE_C_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
   if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
       AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
       AND CMAKE_DEPFILE_FLAGS_C)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-CXX.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-CXX.cmake
index 97998884..cae1f119 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-CXX.cmake
@@ -4,6 +4,7 @@ __compiler_intel_llvm(CXX)
 if("x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
   set(CMAKE_CXX_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -TP)
   set(CMAKE_CXX_CLANG_TIDY_DRIVER_MODE "cl")
+  set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
   if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
       AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
       AND CMAKE_DEPFILE_FLAGS_CXX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-FindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-FindBinUtils.cmake
new file mode 100644
index 00000000..c5b1ee63
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-FindBinUtils.cmake
@@ -0,0 +1,45 @@
+if(NOT DEFINED _CMAKE_PROCESSING_LANGUAGE OR _CMAKE_PROCESSING_LANGUAGE STREQUAL "")
+  message(FATAL_ERROR "Internal error: _CMAKE_PROCESSING_LANGUAGE is not set")
+endif()
+
+# Ubuntu:
+# * /usr/bin/llvm-ar-9
+# * /usr/bin/llvm-ranlib-9
+string(REGEX MATCH "^([0-9]+)" __version_x
+    "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}")
+
+# Debian:
+# * /usr/bin/llvm-ar-4.0
+# * /usr/bin/llvm-ranlib-4.0
+string(REGEX MATCH "^([0-9]+\\.[0-9]+)" __version_x_y
+    "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}")
+
+# Try to find tools in the IntelLLVM Clang tools directory
+get_filename_component(__intel_llvm_hint_1 "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER}" DIRECTORY)
+get_filename_component(__intel_llvm_hint_1 "${__intel_llvm_hint_1}/../bin-llvm" REALPATH)
+
+get_filename_component(__intel_llvm_hint_2 "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER}" DIRECTORY)
+
+set(__intel_llvm_hints ${__intel_llvm_hint_1} ${__intel_llvm_hint_2})
+
+# http://manpages.ubuntu.com/manpages/precise/en/man1/llvm-ar.1.html
+find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
+    "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar-${__version_x_y}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar-${__version_x}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ar"
+    HINTS ${__intel_llvm_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
+    DOC "LLVM archiver"
+)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
+
+# http://manpages.ubuntu.com/manpages/precise/en/man1/llvm-ranlib.1.html
+find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
+    "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib-${__version_x_y}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib-${__version_x}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}llvm-ranlib"
+    HINTS ${__intel_llvm_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
+    DOC "Generate index for LLVM archive"
+)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM.cmake
similarity index 75%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM.cmake
index 14b7ad83..30de1a98 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/IntelLLVM.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/IntelLLVM.cmake
@@ -15,12 +15,27 @@ set(__pch_header_CXX "c++-header")
 set(__pch_header_OBJC "objective-c-header")
 set(__pch_header_OBJCXX "objective-c++-header")
 
+# Variables that are common across front-end variants
+macro(__compiler_intel_llvm_common lang)
+  set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES)
+  set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
+  set(CMAKE_${lang}_ARCHIVE_CREATE_IPO "\"${CMAKE_${lang}_COMPILER_AR}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>")
+  set(CMAKE_${lang}_ARCHIVE_APPEND_IPO "\"${CMAKE_${lang}_COMPILER_AR}\" r <TARGET> <LINK_FLAGS> <OBJECTS>")
+  set(CMAKE_${lang}_ARCHIVE_FINISH_IPO "\"${CMAKE_${lang}_COMPILER_RANLIB}\" <TARGET>")
+endmacro()
+
 if(CMAKE_HOST_WIN32)
   # MSVC-like
   macro(__compiler_intel_llvm lang)
-    if(NOT "x${lang}" STREQUAL "xFortran")
+    if("x${lang}" STREQUAL "xFortran")
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-warn:errors")
+    else()
       set(CMAKE_${lang}_COMPILE_OPTIONS_INVALID_PCH -Winvalid-pch)
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-WX")
     endif()
+    __compiler_intel_llvm_common(${lang})
+    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-Qipo")
+    set(CMAKE_${lang}_LINK_OPTIONS_IPO "-Qipo")
   endmacro()
 else()
   # GNU-like
@@ -58,12 +73,9 @@ else()
     set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-Xlinker" " ")
     set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP)
 
-    set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES)
-    set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
-    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto=thin")
-    set(CMAKE_${lang}_ARCHIVE_CREATE_IPO "\"${CMAKE_${lang}_COMPILER_AR}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_${lang}_ARCHIVE_APPEND_IPO "\"${CMAKE_${lang}_COMPILER_AR}\" r <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_${lang}_ARCHIVE_FINISH_IPO "\"${CMAKE_${lang}_COMPILER_RANLIB}\" <TARGET>")
+    __compiler_intel_llvm_common(${lang})
+    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-ipo")
+    set(CMAKE_${lang}_LINK_OPTIONS_IPO "-ipo")
 
     set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
     set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
@@ -79,7 +91,9 @@ else()
       list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "--target=${CMAKE_${lang}_COMPILER_TARGET}")
     endif()
 
-    if(NOT "x${lang}" STREQUAL "xFortran")
+    if("x${lang}" STREQUAL "xFortran")
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-warn" "errors")
+    else()
       # Precompile Headers
       set(CMAKE_PCH_EXTENSION .pch)
       set(CMAKE_PCH_PROLOGUE "#pragma clang system_header")
@@ -87,6 +101,9 @@ else()
       set(CMAKE_${lang}_COMPILE_OPTIONS_INVALID_PCH -Winvalid-pch)
       set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -Xclang -include-pch -Xclang <PCH_FILE> -Xclang -include -Xclang <PCH_HEADER>)
       set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -Xclang -emit-pch -Xclang -include -Xclang <PCH_HEADER> -x ${__pch_header_${lang}})
+
+      # COMPILE_WARNING_AS_ERROR
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror")
     endif()
   endmacro()
 endif()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C-DetermineCompiler.cmake
new file mode 100644
index 00000000..2ce92fe3
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C-DetermineCompiler.cmake
@@ -0,0 +1,19 @@
+
+set(_compiler_id_pp_test "defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__))")
+
+set(_compiler_id_version_compute "
+# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(1)
+# if defined(__LCC__)
+#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__LCC__- 100)
+# endif
+# if defined(__LCC_MINOR__)
+#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__LCC_MINOR__)
+# endif
+# if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#  define @PREFIX@SIMULATE_ID \"GNU\"
+#  define @PREFIX@SIMULATE_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
+#  define @PREFIX@SIMULATE_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
+#  if defined(__GNUC_PATCHLEVEL__)
+#   define @PREFIX@SIMULATE_VERSION_PATCH @MACRO_DEC@(__GNUC_PATCHLEVEL__)
+#  endif
+# endif")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C-FeatureTests.cmake
new file mode 100644
index 00000000..0ab5265a
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C-FeatureTests.cmake
@@ -0,0 +1,17 @@
+
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304")
+
+# GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it
+# to 201000L.  As the former is strictly greater than the latter, test only
+# for the latter.  If in the future CMake learns about a C feature which was
+# introduced with GNU 4.7, that should test for the correct version, similar
+# to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests.
+set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L")
+set(_cmake_feature_test_c_static_assert "${GNU46_C11}")
+# Since 3.4 at least:
+set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L")
+set(_cmake_feature_test_c_restrict "${GNU34_C99}")
+set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}")
+
+set(GNU_C90 "${_cmake_oldestSupported}")
+set(_cmake_feature_test_c_function_prototypes "${GNU_C90}")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C.cmake
new file mode 100644
index 00000000..3dd6e686
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-C.cmake
@@ -0,0 +1,29 @@
+include(Compiler/LCC)
+__compiler_lcc(C)
+
+
+if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+    AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+    AND CMAKE_DEPFILE_FLAGS_C)
+  # dependencies are computed by the compiler itself
+  set(CMAKE_C_DEPFILE_FORMAT gcc)
+  set(CMAKE_C_DEPENDS_USE_COMPILER TRUE)
+endif()
+
+set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c)
+
+set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90")
+set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90")
+set(CMAKE_C90_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99")
+set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99")
+set(CMAKE_C99_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std=c11")
+set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu11")
+set(CMAKE_C11_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_C17_STANDARD_COMPILE_OPTION "-std=c17")
+set(CMAKE_C17_EXTENSION_COMPILE_OPTION "-std=gnu17")
+set(CMAKE_C23_STANDARD_COMPILE_OPTION "-std=c2x")
+set(CMAKE_C23_EXTENSION_COMPILE_OPTION "-std=gnu2x")
+
+__compiler_check_default_language_standard(C 1.23 90 1.20 11 1.26 17)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake
new file mode 100644
index 00000000..2ce92fe3
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake
@@ -0,0 +1,19 @@
+
+set(_compiler_id_pp_test "defined(__LCC__) && (defined(__GNUC__) || defined(__GNUG__) || defined(__MCST__))")
+
+set(_compiler_id_version_compute "
+# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(1)
+# if defined(__LCC__)
+#  define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__LCC__- 100)
+# endif
+# if defined(__LCC_MINOR__)
+#  define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__LCC_MINOR__)
+# endif
+# if defined(__GNUC__) && defined(__GNUC_MINOR__)
+#  define @PREFIX@SIMULATE_ID \"GNU\"
+#  define @PREFIX@SIMULATE_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
+#  define @PREFIX@SIMULATE_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
+#  if defined(__GNUC_PATCHLEVEL__)
+#   define @PREFIX@SIMULATE_VERSION_PATCH @MACRO_DEC@(__GNUC_PATCHLEVEL__)
+#  endif
+# endif")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX-FeatureTests.cmake
new file mode 100644
index 00000000..45c54708
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX-FeatureTests.cmake
@@ -0,0 +1,109 @@
+
+# Reference: http://gcc.gnu.org/projects/cxx0x.html
+# http://gcc.gnu.org/projects/cxx1y.html
+
+set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404")
+
+set(GNU50_CXX14 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 500 && __cplusplus >= 201402L")
+set(_cmake_feature_test_cxx_variable_templates "${GNU50_CXX14}")
+set(_cmake_feature_test_cxx_relaxed_constexpr "${GNU50_CXX14}")
+set(_cmake_feature_test_cxx_aggregate_default_initializers "${GNU50_CXX14}")
+
+# GNU 4.9 in c++14 mode sets __cplusplus to 201300L, so don't test for the
+# correct value of it below.
+# https://patchwork.ozlabs.org/patch/382470/
+set(GNU49_CXX14 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 409 && __cplusplus > 201103L")
+set(_cmake_feature_test_cxx_contextual_conversions "${GNU49_CXX14}")
+set(_cmake_feature_test_cxx_attribute_deprecated "${GNU49_CXX14}")
+set(_cmake_feature_test_cxx_decltype_auto "${GNU49_CXX14}")
+set(_cmake_feature_test_cxx_digit_separators "${GNU49_CXX14}")
+set(_cmake_feature_test_cxx_generic_lambdas "${GNU49_CXX14}")
+# GNU 4.3 supports binary literals as an extension, but may warn about
+# use of extensions prior to GNU 4.9
+# http://stackoverflow.com/questions/16334024/difference-between-gcc-binary-literals-and-c14-ones
+set(_cmake_feature_test_cxx_binary_literals "${GNU49_CXX14}")
+# The features below are documented as available in GNU 4.8 (by implementing an
+# earlier draft of the standard paper), but that version of the compiler
+# does not set __cplusplus to a value greater than 201103L until GNU 4.9:
+# http://gcc.gnu.org/onlinedocs/gcc-4.8.2/cpp/Standard-Predefined-Macros.html#Standard-Predefined-Macros
+# http://gcc.gnu.org/onlinedocs/gcc-4.9.0/cpp/Standard-Predefined-Macros.html#Standard-Predefined-Macros
+# So, CMake only reports availability for it with GNU 4.9 or later.
+set(_cmake_feature_test_cxx_return_type_deduction "${GNU49_CXX14}")
+set(_cmake_feature_test_cxx_lambda_init_captures "${GNU49_CXX14}")
+
+# Introduced in GCC 4.8.1
+set(GNU481_CXX11 "((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40801) && __cplusplus >= 201103L")
+set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${GNU481_CXX11}")
+set(_cmake_feature_test_cxx_reference_qualified_functions "${GNU481_CXX11}")
+set(GNU48_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L")
+set(_cmake_feature_test_cxx_alignas "${GNU48_CXX11}")
+# The alignof feature works with GNU 4.7 and -std=c++11, but it is documented
+# as available with GNU 4.8, so treat that as true.
+set(_cmake_feature_test_cxx_alignof "${GNU48_CXX11}")
+set(_cmake_feature_test_cxx_attributes "${GNU48_CXX11}")
+set(_cmake_feature_test_cxx_inheriting_constructors "${GNU48_CXX11}")
+set(_cmake_feature_test_cxx_thread_local "${GNU48_CXX11}")
+set(GNU47_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407 && __cplusplus >= 201103L")
+set(_cmake_feature_test_cxx_alias_templates "${GNU47_CXX11}")
+set(_cmake_feature_test_cxx_delegating_constructors "${GNU47_CXX11}")
+set(_cmake_feature_test_cxx_extended_friend_declarations "${GNU47_CXX11}")
+set(_cmake_feature_test_cxx_final "${GNU47_CXX11}")
+set(_cmake_feature_test_cxx_nonstatic_member_init "${GNU47_CXX11}")
+set(_cmake_feature_test_cxx_override "${GNU47_CXX11}")
+set(_cmake_feature_test_cxx_user_literals "${GNU47_CXX11}")
+# NOTE: C++11 was ratified in September 2011. GNU 4.7 is the first minor
+# release following that (March 2012), and the first minor release to
+# support -std=c++11. Prior to that, support for C++11 features is technically
+# experiemental and possibly incomplete (see for example the note below about
+# cxx_variadic_template_template_parameters)
+# GNU does not define __cplusplus correctly before version 4.7.
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=1773
+# __GXX_EXPERIMENTAL_CXX0X__ is defined in prior versions, but may not be
+# defined in the future.
+set(GNU_CXX0X_DEFINED "(__cplusplus >= 201103L || (defined(__GXX_EXPERIMENTAL_CXX0X__) && __GXX_EXPERIMENTAL_CXX0X__))")
+set(GNU46_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && ${GNU_CXX0X_DEFINED}")
+set(_cmake_feature_test_cxx_constexpr "${GNU46_CXX11}")
+set(_cmake_feature_test_cxx_defaulted_move_initializers "${GNU46_CXX11}")
+set(_cmake_feature_test_cxx_enum_forward_declarations "${GNU46_CXX11}")
+set(_cmake_feature_test_cxx_noexcept "${GNU46_CXX11}")
+set(_cmake_feature_test_cxx_nullptr "${GNU46_CXX11}")
+set(_cmake_feature_test_cxx_range_for "${GNU46_CXX11}")
+set(_cmake_feature_test_cxx_unrestricted_unions "${GNU46_CXX11}")
+set(GNU45_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 405 && ${GNU_CXX0X_DEFINED}")
+set(_cmake_feature_test_cxx_explicit_conversions "${GNU45_CXX11}")
+set(_cmake_feature_test_cxx_lambdas "${GNU45_CXX11}")
+set(_cmake_feature_test_cxx_local_type_template_args "${GNU45_CXX11}")
+set(_cmake_feature_test_cxx_raw_string_literals "${GNU45_CXX11}")
+set(GNU44_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && ${GNU_CXX0X_DEFINED}")
+set(_cmake_feature_test_cxx_auto_type "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_defaulted_functions "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_deleted_functions "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_generalized_initializers "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_inline_namespaces "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_sizeof_member "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_strong_enums "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_trailing_return_types "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_unicode_literals "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_uniform_initialization "${GNU44_CXX11}")
+set(_cmake_feature_test_cxx_variadic_templates "${GNU44_CXX11}")
+# TODO: If features are ever recorded for GNU 4.3, there should possibly
+# be a new feature added like cxx_variadic_template_template_parameters,
+# which is implemented by GNU 4.4, but not 4.3. cxx_variadic_templates is
+# actually implemented by GNU 4.3, but variadic template template parameters
+# 'completes' it, so that is the version we record as having the variadic
+# templates capability in CMake. See
+# http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2555.pdf
+# TODO: Should be supported by GNU 4.3
+set(GNU43_CXX11 "${_cmake_oldestSupported} && ${GNU_CXX0X_DEFINED}")
+set(_cmake_feature_test_cxx_decltype "${GNU43_CXX11}")
+set(_cmake_feature_test_cxx_default_function_template_args "${GNU43_CXX11}")
+set(_cmake_feature_test_cxx_long_long_type "${GNU43_CXX11}")
+set(_cmake_feature_test_cxx_right_angle_brackets "${GNU43_CXX11}")
+set(_cmake_feature_test_cxx_rvalue_references "${GNU43_CXX11}")
+set(_cmake_feature_test_cxx_static_assert "${GNU43_CXX11}")
+# TODO: Should be supported since GNU 3.4?
+set(_cmake_feature_test_cxx_extern_templates "${_cmake_oldestSupported} && ${GNU_CXX0X_DEFINED}")
+# TODO: Should be supported forever?
+set(_cmake_feature_test_cxx_func_identifier "${_cmake_oldestSupported} && ${GNU_CXX0X_DEFINED}")
+set(_cmake_feature_test_cxx_variadic_macros "${_cmake_oldestSupported} && ${GNU_CXX0X_DEFINED}")
+set(_cmake_feature_test_cxx_template_template_parameters "${_cmake_oldestSupported} && __cplusplus")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX.cmake
new file mode 100644
index 00000000..b3bdd3c3
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-CXX.cmake
@@ -0,0 +1,31 @@
+include(Compiler/LCC)
+__compiler_lcc(CXX)
+
+
+if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+    AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+    AND CMAKE_DEPFILE_FLAGS_CXX)
+  # dependencies are computed by the compiler itself
+  set(CMAKE_CXX_DEPFILE_FORMAT gcc)
+  set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE)
+endif()
+
+set(CMAKE_CXX_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c++)
+
+set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN "-fvisibility-inlines-hidden")
+
+set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
+set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
+set(CMAKE_CXX98_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
+set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
+set(CMAKE_CXX11_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
+set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+set(CMAKE_CXX14_STANDARD__HAS_FULL_SUPPORT ON)
+set(CMAKE_CXX17_STANDARD_COMPILE_OPTION "-std=c++17")
+set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++17")
+set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std=c++2a")
+set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++2a")
+
+__compiler_check_default_language_standard(CXX 1.19 98 1.20 11 1.21 14 1.24 17 1.26 20)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-FindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-FindBinUtils.cmake
new file mode 100644
index 00000000..4dcdd537
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-FindBinUtils.cmake
@@ -0,0 +1,37 @@
+if(NOT DEFINED _CMAKE_PROCESSING_LANGUAGE OR _CMAKE_PROCESSING_LANGUAGE STREQUAL "")
+  message(FATAL_ERROR "Internal error: _CMAKE_PROCESSING_LANGUAGE is not set")
+endif()
+
+# Ubuntu 16.04:
+# * /usr/bin/gcc-ar-5
+# * /usr/bin/gcc-ranlib-5
+string(REGEX MATCH "^([0-9]+)" __version_x
+    "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}")
+
+string(REGEX MATCH "^([0-9]+\\.[0-9]+)" __version_x_y
+    "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_VERSION}")
+
+# Try to find tools in the same directory as GCC itself
+get_filename_component(__gcc_hints "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER}" DIRECTORY)
+
+# http://manpages.ubuntu.com/manpages/wily/en/man1/gcc-ar.1.html
+find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR NAMES
+    "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x_y}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar-${__version_x}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ar${_CMAKE_COMPILER_SUFFIX}"
+    HINTS ${__gcc_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
+    DOC "A wrapper around 'ar' adding the appropriate '--plugin' option for the GCC compiler"
+)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
+
+# http://manpages.ubuntu.com/manpages/wily/en/man1/gcc-ranlib.1.html
+find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB NAMES
+    "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x_y}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib-${__version_x}"
+    "${_CMAKE_TOOLCHAIN_PREFIX}gcc-ranlib${_CMAKE_COMPILER_SUFFIX}"
+    HINTS ${__gcc_hints}
+    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
+    DOC "A wrapper around 'ranlib' adding the appropriate '--plugin' option for the GCC compiler"
+)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_RANLIB)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-Fortran.cmake
new file mode 100644
index 00000000..8091b299
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC-Fortran.cmake
@@ -0,0 +1,26 @@
+include(Compiler/LCC)
+__compiler_lcc(Fortran)
+
+set(CMAKE_Fortran_SUBMODULE_SEP "@")
+set(CMAKE_Fortran_SUBMODULE_EXT ".smod")
+
+set(CMAKE_Fortran_PREPROCESS_SOURCE
+  "<CMAKE_Fortran_COMPILER> -cpp <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> -o <PREPROCESSED_SOURCE>")
+
+set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-ffixed-form")
+set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
+
+set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_ON "-cpp")
+set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_OFF "-nocpp")
+
+set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpreprocessed")
+
+# No -DNDEBUG for Fortran.
+string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os")
+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3")
+
+# No -isystem for Fortran because it will not find .mod files.
+unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran)
+
+# Fortran-specific feature flags.
+set(CMAKE_Fortran_MODDIR_FLAG -J)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC.cmake
new file mode 100644
index 00000000..bdee9a6b
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LCC.cmake
@@ -0,0 +1,96 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# This module is shared by multiple languages; use include blocker.
+if(__COMPILER_LCC)
+  return()
+endif()
+set(__COMPILER_LCC 1)
+
+include(Compiler/CMakeCommonCompilerMacros)
+
+set(__pch_header_C "c-header")
+set(__pch_header_CXX "c++-header")
+set(__pch_header_OBJC "objective-c-header")
+set(__pch_header_OBJCXX "objective-c++-header")
+
+macro(__compiler_lcc lang)
+  # Feature flags.
+  set(CMAKE_${lang}_VERBOSE_FLAG "-v")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
+  set (_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER NO)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
+  # Support of PIE at link stage depends on various elements : platform, compiler, linker
+  # so to activate it, module CheckPIESupported must be used.
+  set (_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER YES)
+  set(CMAKE_${lang}_LINK_OPTIONS_PIE ${CMAKE_${lang}_COMPILE_OPTIONS_PIE} "-pie")
+  set(CMAKE_${lang}_LINK_OPTIONS_NO_PIE "-no-pie")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_SYSROOT "--sysroot=")
+
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-Wl,")
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP ",")
+
+  # Older versions of gcc (< 4.5) contain a bug causing them to report a missing
+  # header file as a warning if depfiles are enabled, causing check_header_file
+  # tests to always succeed.  Work around this by disabling dependency tracking
+  # in try_compile mode.
+  get_property(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE)
+  if(CMAKE_${lang}_COMPILER_ID STREQUAL "LCC" AND _IN_TC AND NOT CMAKE_FORCE_DEPFILES)
+  else()
+    # distcc does not transform -o to -MT when invoking the preprocessor
+    # internally, as it ought to.  Work around this bug by setting -MT here
+    # even though it isn't strictly necessary.
+    set(CMAKE_DEPFILE_FLAGS_${lang} "-MD -MT <DEP_TARGET> -MF <DEP_FILE>")
+  endif()
+
+  # Initial configuration flags.
+  string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
+  string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
+  string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
+  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
+  string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
+  set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
+  set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
+  set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
+  set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES)
+  set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER NO)
+  set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
+  set(__lto_flags -flto)
+  list(APPEND __lto_flags -fno-fat-lto-objects)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_IPO ${__lto_flags})
+
+  set(CMAKE_${lang}_ARCHIVE_CREATE_IPO
+    "\"${CMAKE_${lang}_COMPILER_AR}\" cr <TARGET> <LINK_FLAGS> <OBJECTS>"
+  )
+
+  set(CMAKE_${lang}_ARCHIVE_APPEND_IPO
+    "\"${CMAKE_${lang}_COMPILER_AR}\" r <TARGET> <LINK_FLAGS> <OBJECTS>"
+  )
+
+  set(CMAKE_${lang}_ARCHIVE_FINISH_IPO
+    "\"${CMAKE_${lang}_COMPILER_RANLIB}\" <TARGET>"
+  )
+
+  set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
+  if(CMAKE_${lang}_COMPILER_ARG1)
+    separate_arguments(_COMPILER_ARGS NATIVE_COMMAND "${CMAKE_${lang}_COMPILER_ARG1}")
+    list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND ${_COMPILER_ARGS})
+    unset(_COMPILER_ARGS)
+  endif()
+  list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "-dM" "-E" "-c" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp")
+
+  if(NOT "x${lang}" STREQUAL "xFortran")
+    set(CMAKE_PCH_EXTENSION .gch)
+    if (NOT CMAKE_GENERATOR MATCHES "Xcode")
+      set(CMAKE_PCH_PROLOGUE "#pragma GCC system_header")
+    endif()
+    set(CMAKE_${lang}_COMPILE_OPTIONS_INVALID_PCH -Winvalid-pch)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -include <PCH_HEADER>)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -x ${__pch_header_${lang}} -include <PCH_HEADER>)
+  endif()
+endmacro()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/LLVMFlang-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/LLVMFlang-Fortran.cmake
new file mode 100644
index 00000000..651bf51a
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/LLVMFlang-Fortran.cmake
@@ -0,0 +1,15 @@
+set(CMAKE_Fortran_VERBOSE_FLAG "-v")
+
+set(CMAKE_Fortran_SUBMODULE_SEP "-")
+set(CMAKE_Fortran_SUBMODULE_EXT ".mod")
+
+set(CMAKE_Fortran_PREPROCESS_SOURCE
+    "<CMAKE_Fortran_COMPILER> -cpp <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
+
+set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-ffixed-form")
+set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
+
+set(CMAKE_Fortran_MODDIR_FLAG "-module-dir")
+
+set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_ON "-cpp")
+set(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_OFF "-nocpp")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-C.cmake
new file mode 100644
index 00000000..6bf6b4e8
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-C.cmake
@@ -0,0 +1,72 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+include(Compiler/MSVC)
+__compiler_msvc(C)
+
+include(Compiler/CMakeCommonCompilerMacros)
+
+if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27)
+  set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "")
+  set(CMAKE_C99_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "")
+  set(CMAKE_C11_STANDARD_COMPILE_OPTION "-std:c11")
+  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std:c11")
+
+  if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.28)
+    set(CMAKE_C90_STANDARD__HAS_FULL_SUPPORT ON)
+    set(CMAKE_C99_STANDARD__HAS_FULL_SUPPORT ON)
+    set(CMAKE_C11_STANDARD__HAS_FULL_SUPPORT ON)
+    set(CMAKE_C17_STANDARD_COMPILE_OPTION "-std:c17")
+    set(CMAKE_C17_EXTENSION_COMPILE_OPTION "-std:c17")
+  else()
+    # Special case for 19.27 (VS 16.7): C11 has partial support.
+    macro(cmake_record_c_compile_features)
+      _has_compiler_features_c(90)
+      _has_compiler_features_c(99)
+      list(APPEND CMAKE_C11_COMPILE_FEATURES c_std_11)
+      set(_result 0) # expected by cmake_determine_compile_features
+    endmacro()
+  endif()
+
+  __compiler_check_default_language_standard(C 19.27 99)
+else()
+  # MSVC has no specific options to set C language standards, but set them as
+  # empty strings anyways so the feature test infrastructure can at least check
+  # to see if they are defined.
+  set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_C90_EXTENSION_COMPILE_OPTION "")
+  set(CMAKE_C99_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_C99_EXTENSION_COMPILE_OPTION "")
+  set(CMAKE_C11_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_C11_EXTENSION_COMPILE_OPTION "")
+
+  # There is no meaningful default for this
+  set(CMAKE_C_STANDARD_DEFAULT "")
+
+  # There are no C compiler modes so we hard-code the known compiler supported
+  # features. Override the default macro for this special case.  Pretend that
+  # all language standards are available so that at least compilation
+  # can be attempted.
+  macro(cmake_record_c_compile_features)
+    list(APPEND CMAKE_C_COMPILE_FEATURES
+      c_std_90
+      c_std_99
+      c_std_11
+      c_std_17
+      c_std_23
+      c_function_prototypes
+      )
+    list(APPEND CMAKE_C90_COMPILE_FEATURES c_std_90 c_function_prototypes)
+    list(APPEND CMAKE_C99_COMPILE_FEATURES c_std_99)
+    list(APPEND CMAKE_C11_COMPILE_FEATURES c_std_11)
+    if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0)
+      list(APPEND CMAKE_C_COMPILE_FEATURES c_variadic_macros)
+      list(APPEND CMAKE_C99_COMPILE_FEATURES c_variadic_macros)
+    endif()
+    set(_result 0) # expected by cmake_determine_compile_features
+  endmacro()
+endif()
+
+set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -TC)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-CXX.cmake
similarity index 85%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-CXX.cmake
index f1c7450f..10a9073a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-CXX.cmake
@@ -1,9 +1,10 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-include(Compiler/CMakeCommonCompilerMacros)
+include(Compiler/MSVC)
+__compiler_msvc(CXX)
 
-set(CMAKE_CXX_CLANG_TIDY_DRIVER_MODE "cl")
+include(Compiler/CMakeCommonCompilerMacros)
 
 if ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.0.24215.1 AND
      CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.10) OR
@@ -70,12 +71,20 @@ elseif (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)
       cxx_std_14
       cxx_std_17
       cxx_std_20
+      cxx_std_23
+      cxx_std_26
       )
     _record_compiler_features(CXX "" CMAKE_CXX_COMPILE_FEATURES)
   endmacro()
 endif()
 
-# /JMC "Just My Code" is only supported by MSVC 19.05 onward.
-if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.05)
-  set(CMAKE_CXX_COMPILE_OPTIONS_JMC "-JMC")
-endif()
+if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.34")
+  string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
+    "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> <SOURCE> -nologo -TP"
+    " -showIncludes"
+    " -scanDependencies <DYNDEP_FILE>"
+    " -Fo<OBJECT>")
+  set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_DEPFILE_FORMAT "msvc")
+  set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FORMAT "msvc")
+  set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG "@<MODULE_MAP_FILE>")
+endif ()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/MSVC-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC.cmake
new file mode 100644
index 00000000..154b657b
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/MSVC.cmake
@@ -0,0 +1,25 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# This module is shared by multiple languages; use include blocker.
+if(__COMPILER_MSVC)
+  return()
+endif()
+set(__COMPILER_MSVC 1)
+
+macro(__compiler_msvc lang)
+  set(CMAKE_${lang}_CLANG_TIDY_DRIVER_MODE "cl")
+  set(CMAKE_${lang}_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-WX")
+
+  # /JMC "Just My Code" is only supported by MSVC 19.05 onward.
+  if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 19.05)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_JMC "-JMC")
+  endif()
+
+  # The `/external:I` flag was made non-experimental in 19.29.30036.3.
+  if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30036.3)
+    set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-external:I")
+    set(_CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING "-external:W0 ")
+  endif ()
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NAG-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NAG-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/NAG-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/NAG-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-C.cmake
new file mode 100644
index 00000000..9295abda
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-C.cmake
@@ -0,0 +1,23 @@
+include(Compiler/PGI-C)
+include(Compiler/NVHPC)
+
+# Needed so that we support `LANGUAGE` property correctly
+set(CMAKE_C_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c)
+
+if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 20.11)
+  set(CMAKE_C17_STANDARD_COMPILE_OPTION  -std=c17)
+  set(CMAKE_C17_EXTENSION_COMPILE_OPTION -std=gnu17)
+endif()
+
+if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 21.07)
+  set(CMAKE_DEPFILE_FLAGS_C "-MD -MT <DEP_TARGET> -MF <DEP_FILE>")
+  set(CMAKE_C_DEPFILE_FORMAT gcc)
+  set(CMAKE_C_DEPENDS_USE_COMPILER TRUE)
+else()
+  # Before NVHPC 21.07 the `-MD` flag implicitly
+  # implies `-E` and therefore compilation and dependency generation
+  # can't occur in the same invocation
+  set(CMAKE_C_DEPENDS_EXTRA_COMMANDS "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -x c -M <SOURCE> -MT <OBJECT> -MD<DEP_FILE>")
+endif()
+
+__compiler_nvhpc(C)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-CXX.cmake
new file mode 100644
index 00000000..59ba7bfa
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-CXX.cmake
@@ -0,0 +1,22 @@
+include(Compiler/PGI-CXX)
+include(Compiler/NVHPC)
+
+# Needed so that we support `LANGUAGE` property correctly
+set(CMAKE_CXX_COMPILE_OPTIONS_EXPLICIT_LANGUAGE -x c++)
+
+if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20.11)
+  set(CMAKE_CXX20_STANDARD_COMPILE_OPTION  -std=c++20)
+  set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION -std=gnu++20)
+endif()
+
+if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 21.07)
+  set(CMAKE_DEPFILE_FLAGS_CXX "-MD -MT <DEP_TARGET> -MF <DEP_FILE>")
+  set(CMAKE_CXX_DEPFILE_FORMAT gcc)
+  set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE)
+else()
+  # Before NVHPC 21.07 the `-MD` flag implicitly
+  # implies `-E` and therefore compilation and dependency generation
+  # can't occur in the same invocation
+  set(CMAKE_CXX_DEPENDS_EXTRA_COMMANDS "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -x c++ -M <SOURCE> -MT <OBJECT> -MD<DEP_FILE>")
+endif()
+__compiler_nvhpc(CXX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC.cmake
similarity index 73%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC.cmake
index 70486705..474ac80e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVHPC.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVHPC.cmake
@@ -12,4 +12,6 @@ include(Compiler/PGI)
 
 macro(__compiler_nvhpc lang)
   # Logic specific to NVHPC.
+  set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror" "all-warnings")
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVIDIA-CUDA.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVIDIA-CUDA.cmake
similarity index 85%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/NVIDIA-CUDA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/NVIDIA-CUDA.cmake
index c2fe42df..c8dcd2a1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVIDIA-CUDA.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -5,8 +5,9 @@ set(CMAKE_CUDA_VERBOSE_FLAG "-v")
 set(CMAKE_CUDA_VERBOSE_COMPILE_FLAG "-Xcompiler=-v")
 
 set(_CMAKE_COMPILE_AS_CUDA_FLAG "-x cu")
+set(_CMAKE_CUDA_WHOLE_FLAG "-c")
+set(_CMAKE_CUDA_RDC_FLAG "-rdc=true")
 set(_CMAKE_CUDA_PTX_FLAG "-ptx")
-set(_CMAKE_CUDA_DEVICE_CODE "-dc")
 
 if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 10.2.89)
   # The -forward-unknown-to-host-compiler flag was only
@@ -28,6 +29,11 @@ if(CMAKE_CUDA_HOST_COMPILER AND NOT CMAKE_GENERATOR MATCHES "Visual Studio")
   string(APPEND _CMAKE_CUDA_EXTRA_FLAGS " -ccbin=<CMAKE_CUDA_HOST_COMPILER>")
 endif()
 
+if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 10.2.89)
+  # Starting in 10.2, nvcc supported treating all warnings as errors
+  set(CMAKE_CUDA_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror" "all-warnings")
+endif()
+
 if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 10.2.89)
   # The -MD flag was only added to nvcc in 10.2 so
   # before that we had to invoke the compiler twice
@@ -42,6 +48,13 @@ if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
   set(CMAKE_CUDA_DEPENDS_USE_COMPILER TRUE)
 endif()
 
+if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.2)
+  set(_CMAKE_CUDA_IPO_SUPPORTED_BY_CMAKE YES)
+  set(_CMAKE_CUDA_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
+
+  set(CMAKE_CUDA_DEVICE_LINK_OPTIONS_IPO " -dlto")
+endif()
+
 if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
   set(CMAKE_CUDA_COMPILE_OPTIONS_PIE -Xcompiler=-fPIE)
   set(CMAKE_CUDA_COMPILE_OPTIONS_PIC -Xcompiler=-fPIC)
@@ -55,6 +68,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STREQUAL "xMSVC")
   string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
   string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
 endif()
+
 set(CMAKE_SHARED_LIBRARY_CREATE_CUDA_FLAGS -shared)
 set(CMAKE_INCLUDE_SYSTEM_FLAG_CUDA -isystem=)
 
@@ -126,15 +140,19 @@ else()
 
 endif()
 
-# FIXME: investigate use of --options-file.
-# Tell Makefile generator that nvcc does not support @<rspfile> syntax.
-set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_INCLUDES 0)
-set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 0)
-set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 0)
-
 if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "9.0")
   set(CMAKE_CUDA_RESPONSE_FILE_DEVICE_LINK_FLAG "--options-file ")
   set(CMAKE_CUDA_RESPONSE_FILE_FLAG "--options-file ")
 endif()
 
+if (CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0")
+  set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+  set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 1)
+  set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+else()
+  set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_INCLUDES 0)
+  set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_LIBRARIES 0)
+  set(CMAKE_CUDA_USE_RESPONSE_FILE_FOR_OBJECTS 0)
+endif()
+
 __compiler_check_default_language_standard(CUDA 6.0 03)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/NVIDIA-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/OpenWatcom.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/OpenWatcom.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PGI-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PGI-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PGI.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PGI.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PGI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PGI.cmake
index 4f8b90b1..d111be9a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/PGI.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/PGI.cmake
@@ -26,7 +26,7 @@ macro(__compiler_pgi lang)
   endif()
 
   set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-Wl,")
-  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG ",")
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP ",")
 
   set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES)
   if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le AND (NOT CMAKE_HOST_WIN32 OR CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 16.3))
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/PathScale.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/PathScale.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/QCC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/QCC-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/QCC.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/QCC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/QCC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/QCC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SCO-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SCO-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SCO-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SCO-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SCO-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SCO-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SCO-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SCO-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SCO-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SCO-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SCO-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SCO-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SCO.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SCO.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SCO.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SCO.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SDCC-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SDCC-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-ASM.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-ASM.cmake
index 0d67400f..fc0f2fa0 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-ASM.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-ASM.cmake
@@ -1,3 +1,6 @@
+include(Compiler/SunPro)
+__compiler_sunpro(ASM)
+
 set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s )
 
 set(CMAKE_ASM_VERBOSE_FLAG "-#")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-C-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-C-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-C-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-C-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-C.cmake
similarity index 89%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-C.cmake
index c98656f5..b06719d7 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-C.cmake
@@ -2,6 +2,7 @@
 # file Copyright.txt or https://cmake.org/licensing for details.
 
 include(Compiler/SunPro)
+__compiler_sunpro(C)
 
 set(CMAKE_C_VERBOSE_FLAG "-#")
 
@@ -33,8 +34,13 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Bdynamic")
 endforeach()
 
-set(CMAKE_C_LINKER_WRAPPER_FLAG "-Qoption" "ld" " ")
-set(CMAKE_C_LINKER_WRAPPER_FLAG_SEP ",")
+if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "5.12")
+  set(CMAKE_C_LINKER_WRAPPER_FLAG "-Qoption" "ld" " ")
+  set(CMAKE_C_LINKER_WRAPPER_FLAG_SEP ",")
+else()
+  set(CMAKE_C_LINKER_WRAPPER_FLAG "-Wl,")
+  set(CMAKE_C_LINKER_WRAPPER_FLAG_SEP ",")
+endif()
 
 if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 5.13)
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-CXX-FeatureTests.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-CXX.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-CXX.cmake
index aa8a9c54..f835f2d9 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-CXX.cmake
@@ -2,6 +2,7 @@
 # file Copyright.txt or https://cmake.org/licensing for details.
 
 include(Compiler/SunPro)
+__compiler_sunpro(CXX)
 
 set(CMAKE_CXX_VERBOSE_FLAG "-v")
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-Fortran.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-Fortran.cmake
index 0ba50157..d3369804 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro-Fortran.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro-Fortran.cmake
@@ -1,3 +1,6 @@
+include(Compiler/SunPro)
+__compiler_sunpro(Fortran)
+
 set(CMAKE_Fortran_VERBOSE_FLAG "-v")
 set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed")
 set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro.cmake
similarity index 74%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro.cmake
index 52da39a8..331cdfc0 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/SunPro.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/SunPro.cmake
@@ -8,3 +8,7 @@ endif()
 set(__COMPILER_SUNPRO 1)
 
 include(Compiler/CMakeCommonCompilerMacros)
+
+macro(__compiler_sunpro lang)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-errwarn=%all")
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/TI-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/TI-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/TI-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/TI-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/TI-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/TI-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/TI-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/TI-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/TI-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/TI-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/TI-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/TI-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/TI-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/TI-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/TI-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/TI-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/TI.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/TI.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/TI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/TI.cmake
index 0f9ded3c..6cb115ba 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/TI.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/TI.cmake
@@ -15,6 +15,7 @@ set(__COMPILER_TI_SOURCE_FLAG_CXX "--cpp_file")
 set(__COMPILER_TI_SOURCE_FLAG_ASM "--asm_file")
 
 macro(__compiler_ti lang)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "--emit_warnings_as_errors")
   set(CMAKE_${lang}_RESPONSE_FILE_FLAG "--cmd_file=")
   # Using --cmd_file flag is not possible after the --run_linker flag.
   # By using a whitespace only the filename is used without flag.
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-ASM.cmake
new file mode 100644
index 00000000..19bce191
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-ASM.cmake
@@ -0,0 +1,7 @@
+include(Compiler/Tasking)
+
+set(CMAKE_ASM_OUTPUT_EXTENSION ".o")
+set(CMAKE_ASM_OUTPUT_EXTENSION_REPLACE 1)
+
+set(CMAKE_ASM_COMPILE_OBJECT       "<CMAKE_ASM_COMPILER> <INCLUDES> <FLAGS> -o <OBJECT> <SOURCE>")
+set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS S;s;asm;msa)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-C.cmake
new file mode 100644
index 00000000..0ea3cd2f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-C.cmake
@@ -0,0 +1,47 @@
+include(Compiler/Tasking)
+__compiler_tasking(C)
+
+set(CMAKE_C90_STANDARD_COMPILE_OPTION "--iso=90" "--strict")
+set(CMAKE_C90_EXTENSION_COMPILE_OPTION "--iso=90" " ")
+
+set(CMAKE_C99_STANDARD_COMPILE_OPTION "--iso=99" "--strict")
+set(CMAKE_C99_EXTENSION_COMPILE_OPTION "--iso=99" " ")
+
+set(CMAKE_C11_STANDARD_COMPILE_OPTION "--iso=11" "--strict")
+set(CMAKE_C11_EXTENSION_COMPILE_OPTION "--iso=11" " ")
+
+if(CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "TriCore")
+  if(CMAKE_TASKING_TOOLSET STREQUAL "SmartCode")
+    __compiler_check_default_language_standard(C 10.1 11)
+  else()
+    __compiler_check_default_language_standard(C 6.3 11)
+  endif()
+elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARM")
+  if(CMAKE_TASKING_TOOLSET STREQUAL "SmartCode")
+    __compiler_check_default_language_standard(C 10.1 11)
+  elseif(CMAKE_TASKING_TOOLSET STREQUAL "TriCore")
+    __compiler_check_default_language_standard(C 6.3 11)
+  else()
+    __compiler_check_default_language_standard(C 6.0 11)
+  endif()
+elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "MCS")
+  if(CMAKE_TASKING_TOOLSET STREQUAL "SmartCode")
+    __compiler_check_default_language_standard(C 10.1 11)
+  elseif(CMAKE_TASKING_TOOLSET STREQUAL "TriCore")
+    __compiler_check_default_language_standard(C 6.3 11)
+  else()
+    __compiler_check_default_language_standard(C 3.3 11)
+  endif()
+elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "ARC")
+  __compiler_check_default_language_standard(C 10.1 11)
+elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "8051")
+  if(CMAKE_TASKING_TOOLSET STREQUAL "SmartCode")
+    __compiler_check_default_language_standard(C 10.1 11)
+  elseif(CMAKE_TASKING_TOOLSET STREQUAL "TriCore")
+    __compiler_check_default_language_standard(C 6.3 11)
+  else()
+    __compiler_check_default_language_standard(C 7.2 89)
+  endif()
+elseif(CMAKE_C_COMPILER_ARCHITECTURE_ID STREQUAL "PCP")
+  __compiler_check_default_language_standard(C 6.3 11)
+endif()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-CXX.cmake
new file mode 100644
index 00000000..635104c1
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-CXX.cmake
@@ -0,0 +1,31 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+include(Compiler/Tasking)
+__compiler_tasking(CXX)
+
+set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "--c++=03" "--strict")
+set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "--iso=03" " ")
+
+set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "--c++=11" "--strict")
+set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "--c++=11" " ")
+
+set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "--c++=14" "--strict")
+set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "--c++=14" " ")
+
+if(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "TriCore")
+  if(CMAKE_TASKING_TOOLSET STREQUAL "SmartCode")
+    __compiler_check_default_language_standard(CXX 10.1 14)
+  else()
+    __compiler_check_default_language_standard(CXX 6.3 14)
+  endif()
+elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID STREQUAL "ARM")
+  if(CMAKE_TASKING_TOOLSET STREQUAL "SmartCode")
+    __compiler_check_default_language_standard(CXX 10.1 14)
+  elseif(CMAKE_TASKING_TOOLSET STREQUAL "TriCore")
+    __compiler_check_default_language_standard(CXX 6.3 14)
+  else()
+    __compiler_check_default_language_standard(CXX 6.0 14)
+  endif()
+else()
+  message(FATAL_ERROR "CXX is not supported with the ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} architecture.")
+endif()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-DetermineCompiler.cmake
new file mode 100644
index 00000000..a40be199
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-DetermineCompiler.cmake
@@ -0,0 +1,10 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+set(_compiler_id_pp_test "defined(__TASKING__)")
+
+set(_compiler_id_version_compute "
+  # define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__VERSION__/1000)
+  # define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__VERSION__ % 100)")
+
+string(APPEND _compiler_id_version_compute "
+# define @PREFIX@COMPILER_VERSION_INTERNAL @MACRO_DEC@(__VERSION__)")
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-FindBinUtils.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-FindBinUtils.cmake
new file mode 100644
index 00000000..eab31d72
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking-FindBinUtils.cmake
@@ -0,0 +1,18 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# Find the archiver for the compiler architecture, which is always in the same
+# directory as the compiler.
+if(NOT DEFINED _CMAKE_PROCESSING_LANGUAGE OR _CMAKE_PROCESSING_LANGUAGE STREQUAL "")
+  message(FATAL_ERROR "Internal error: _CMAKE_PROCESSING_LANGUAGE is not set")
+endif()
+
+get_filename_component(__tasking_hints "${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER}" DIRECTORY)
+
+find_program(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR
+  NAMES artc ararm armcs ar51 ararc arpcp
+  HINTS ${__tasking_hints}
+  NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH
+  DOC "Tasking Archiver"
+)
+mark_as_advanced(CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_AR)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking.cmake
new file mode 100644
index 00000000..5bf066ee
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/Tasking.cmake
@@ -0,0 +1,54 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# This module is shared by multiple languages; use include blocker.
+if(_Tasking_CMAKE_LOADED)
+  return()
+endif()
+set(_Tasking_CMAKE_LOADED TRUE)
+include(Compiler/CMakeCommonCompilerMacros)
+
+set(CMAKE_EXECUTABLE_SUFFIX ".elf")
+set(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
+set(BUILD_SHARED_LIBS FALSE CACHE BOOL "")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+set(CMAKE_LINK_SEARCH_START_STATIC TRUE)
+
+if(NOT CMAKE_TASKING_TOOLSET)
+  set(CMAKE_TASKING_TOOLSET "Standalone")
+endif()
+
+macro(__compiler_tasking lang)
+
+  set(CMAKE_${lang}_VERBOSE_FLAG "-v")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "--pic")
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-Wl" " ")
+  set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "-f ")
+  set(CMAKE_DEPFILE_FLAGS_${lang} "--dep-file=<DEP_FILE>")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "--warning-as-errors")
+
+  string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
+  string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -O0 -g")
+  string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -t4 -DNDEBUG")
+  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -t2 -DNDEBUG")
+  string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -t2 -g -DNDEBUG")
+
+  set(CMAKE_${lang}_ARCHIVE_CREATE "\"${CMAKE_${lang}_COMPILER_AR}\" -r <TARGET> <OBJECTS>")
+  set(CMAKE_${lang}_ARCHIVE_APPEND "\"${CMAKE_${lang}_COMPILER_AR}\" -r <TARGET> <OBJECTS>")
+  set(CMAKE_${lang}_ARCHIVE_FINISH "")
+
+  set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -cs <SOURCE> -o <ASSEMBLY_SOURCE>")
+  set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -Ep <SOURCE> > <PREPROCESSED_SOURCE>")
+
+  set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}")
+  if(CMAKE_${lang}_COMPILER_ARG1)
+    separate_arguments(_COMPILER_ARGS NATIVE_COMMAND "${CMAKE_${lang}_COMPILER_ARG1}")
+    list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND ${_COMPILER_ARGS})
+    unset(_COMPILER_ARGS)
+  endif()
+  list(APPEND CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "-Ep" "${CMAKE_ROOT}/Modules/CMakeCXXCompilerABI.cpp")
+
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/TinyCC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/TinyCC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/TinyCC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/TinyCC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/VisualAge-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/VisualAge-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/Watcom-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/Watcom-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/Watcom-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/Watcom-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL-Fortran/cpp b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL-Fortran/cpp
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL-Fortran/cpp
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL-Fortran/cpp
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XL.cmake
index 8b9d4a9d..844fcfd8 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/XL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/XL.cmake
@@ -15,6 +15,7 @@ macro(__compiler_xl lang)
   set(CMAKE_${lang}_VERBOSE_FLAG "-V")
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-qpic")
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-qpic")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-qhalt=i")
   set(CMAKE_${lang}_RESPONSE_FILE_FLAG "-qoptfile=")
   set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "-qoptfile=")
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang.cmake
similarity index 90%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang.cmake
index cdf0fdca..8c3e5e99 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Compiler/XLClang.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Compiler/XLClang.cmake
@@ -17,6 +17,7 @@ macro(__compiler_xlclang lang)
   set(CMAKE_${lang}_VERBOSE_FLAG "-V")
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIC")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror")
   set(CMAKE_${lang}_RESPONSE_FILE_FLAG "@")
   set(CMAKE_${lang}_RESPONSE_FILE_LINK_FLAG "@")
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/zOS-C-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/zOS-C-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/zOS-C-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/zOS-C-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/GHS_default.gpj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/GHS_default.gpj.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/GHS_default.gpj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/GHS_default.gpj.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/GHS_lib.gpj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/GHS_lib.gpj.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/GHS_lib.gpj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/GHS_lib.gpj.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-10.csproj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-10.csproj.in
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-10.csproj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-10.csproj.in
index ed5e8476..fba74ff5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-10.csproj.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-10.csproj.in
@@ -6,6 +6,9 @@
     <Keyword>Win32Proj</Keyword>
     @id_system@
     @id_system_version@
+    @id_TargetFrameworkVersion@
+    @id_TargetFrameworkIdentifier@
+    @id_TargetFrameworkTargetsVersion@
     @id_WindowsTargetPlatformVersion@
     @id_WindowsSDKDesktopARMSupport@
   </PropertyGroup>
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-10.vcxproj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-10.vcxproj.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-10.vcxproj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-10.vcxproj.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-7.vcproj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-7.vcproj.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-7.vcproj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-7.vcproj.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-Intel.vfproj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-Intel.vfproj.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-Intel.vfproj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-Intel.vfproj.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-NsightTegra.vcxproj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-NsightTegra.vcxproj.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/VS-NsightTegra.vcxproj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/VS-NsightTegra.vcxproj.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/Xcode-3.pbxproj.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/Xcode-3.pbxproj.in
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/Xcode-3.pbxproj.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/Xcode-3.pbxproj.in
index cca54bc6..543c6a94 100644
--- a/deps/cmake/share/cmake-3.21/Modules/CompilerId/Xcode-3.pbxproj.in
+++ b/deps/cmake/share/cmake-3.25/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -49,6 +49,7 @@
 		};
 		2C8FEB8E15DC1A1A00E56A5D = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -82,6 +83,7 @@
 			buildSettings = {
 				CODE_SIGNING_REQUIRED = NO;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
+				GENERATE_INFOPLIST_FILE = YES;
 				SYMROOT = .;
 				@id_archs@
 				@id_arch_active@
diff --git a/deps/cmake/share/cmake-3.21/Modules/CompilerId/main.swift.in b/deps/cmake/share/cmake-3.25/Modules/CompilerId/main.swift.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/CompilerId/main.swift.in
rename to deps/cmake/share/cmake-3.25/Modules/CompilerId/main.swift.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Dart.cmake b/deps/cmake/share/cmake-3.25/Modules/Dart.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Dart.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Dart.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/DartConfiguration.tcl.in b/deps/cmake/share/cmake-3.25/Modules/DartConfiguration.tcl.in
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/DartConfiguration.tcl.in
rename to deps/cmake/share/cmake-3.25/Modules/DartConfiguration.tcl.in
index e5b1e5d7..afa36f7f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/DartConfiguration.tcl.in
+++ b/deps/cmake/share/cmake-3.25/Modules/DartConfiguration.tcl.in
@@ -21,6 +21,7 @@ LabelsForSubprojects: @CTEST_LABELS_FOR_SUBPROJECTS@
 
 # Submission information
 SubmitURL: @SUBMIT_URL@
+SubmitInactivityTimeout: @CTEST_SUBMIT_INACTIVITY_TIMEOUT@
 
 # Dashboard start time
 NightlyStartTime: @NIGHTLY_START_TIME@
diff --git a/deps/cmake/share/cmake-3.21/Modules/DeployQt4.cmake b/deps/cmake/share/cmake-3.25/Modules/DeployQt4.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/DeployQt4.cmake
rename to deps/cmake/share/cmake-3.25/Modules/DeployQt4.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Documentation.cmake b/deps/cmake/share/cmake-3.25/Modules/Documentation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Documentation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Documentation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/DummyCXXFile.cxx b/deps/cmake/share/cmake-3.25/Modules/DummyCXXFile.cxx
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/DummyCXXFile.cxx
rename to deps/cmake/share/cmake-3.25/Modules/DummyCXXFile.cxx
diff --git a/deps/cmake/share/cmake-3.21/Modules/ExternalData.cmake b/deps/cmake/share/cmake-3.25/Modules/ExternalData.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/ExternalData.cmake
rename to deps/cmake/share/cmake-3.25/Modules/ExternalData.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/ExternalData_config.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalData_config.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/ExternalData_config.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/ExternalData_config.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/ExternalProject.cmake b/deps/cmake/share/cmake-3.25/Modules/ExternalProject.cmake
similarity index 78%
rename from deps/cmake/share/cmake-3.21/Modules/ExternalProject.cmake
rename to deps/cmake/share/cmake-3.25/Modules/ExternalProject.cmake
index 9e25beec..22a25bd1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/ExternalProject.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject.cmake
@@ -170,6 +170,19 @@ External Project Definition
         the default name is generally suitable and is not normally used outside
         of code internal to the ``ExternalProject`` module.
 
+      ``DOWNLOAD_EXTRACT_TIMESTAMP <bool>``
+        .. versionadded:: 3.24
+
+        When specified with a true value, the timestamps of the extracted
+        files will match those in the archive. When false, the timestamps of
+        the extracted files will reflect the time at which the extraction
+        was performed. If the download URL changes, timestamps based off
+        those in the archive can result in dependent targets not being rebuilt
+        when they potentially should have been. Therefore, unless the file
+        timestamps are significant to the project in some way, use a false
+        value for this option. If ``DOWNLOAD_EXTRACT_TIMESTAMP`` is not given,
+        the default is false. See policy :policy:`CMP0135`.
+
       ``DOWNLOAD_NO_EXTRACT <bool>``
         .. versionadded:: 3.6
 
@@ -224,16 +237,16 @@ External Project Definition
       ``TLS_CAINFO <file>``
         Specify a custom certificate authority file to use if ``TLS_VERIFY``
         is enabled. If this option is not specified, the value of the
-        ``CMAKE_TLS_CAINFO`` variable will be used instead (see
+        :variable:`CMAKE_TLS_CAINFO` variable will be used instead (see
         :command:`file(DOWNLOAD)`)
 
       ``NETRC <level>``
         .. versionadded:: 3.11
 
         Specify whether the ``.netrc`` file is to be used for operation.
-        If this option is not specified, the value of the ``CMAKE_NETRC``
-        variable will be used instead (see :command:`file(DOWNLOAD)`)
-        Valid levels are:
+        If this option is not specified, the value of the
+        :variable:`CMAKE_NETRC` variable will be used instead
+        (see :command:`file(DOWNLOAD)`).  Valid levels are:
 
         ``IGNORED``
           The ``.netrc`` file is ignored.
@@ -251,8 +264,8 @@ External Project Definition
 
         Specify an alternative ``.netrc`` file to the one in your home directory
         if the ``NETRC`` level is ``OPTIONAL`` or ``REQUIRED``. If this option
-        is not specified, the value of the ``CMAKE_NETRC_FILE`` variable will
-        be used instead (see :command:`file(DOWNLOAD)`)
+        is not specified, the value of the :variable:`CMAKE_NETRC_FILE` variable
+        will be used instead (see :command:`file(DOWNLOAD)`)
 
       .. versionadded:: 3.1
         Added support for `tbz2`, `.tar.xz`, `.txz`, and `.7z` extensions.
@@ -288,6 +301,9 @@ External Project Definition
         If ``GIT_SHALLOW`` is enabled then ``GIT_TAG`` works only with
         branch names and tags.  A commit hash is not allowed.
 
+        Note that if not provided, ``GIT_TAG`` defaults to ``master``, not the
+        default Git branch name.
+
       ``GIT_REMOTE_NAME <name>``
         The optional name of the remote. If this option is not specified, it
         defaults to ``origin``.
@@ -353,6 +369,10 @@ External Project Definition
           When ``GIT_REMOTE_UPDATE_STRATEGY`` is not present, this is the
           default strategy unless the default has been overridden with
           ``CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY`` (see below).
+          Note that if the branch specified in ``GIT_TAG`` is different to
+          the upstream branch currently being tracked, it is not safe to
+          perform a rebase. In that situation, ``REBASE`` will silently be
+          treated as ``CHECKOUT`` instead.
 
         ``REBASE_CHECKOUT``
           Same as ``REBASE`` except if the rebase fails, an annotated tag will
@@ -369,8 +389,9 @@ External Project Definition
         override the default strategy.  This variable should not be set by a
         project, it is intended for the user to set.  It is primarily intended
         for use in continuous integration scripts to ensure that when history
-        is rewritten on a remote branch, the build doesn't end up with unintended
-        changes or failed builds resulting from conflicts during rebase operations.
+        is rewritten on a remote branch, the build doesn't end up with
+        unintended changes or failed builds resulting from conflicts during
+        rebase operations.
 
     *Subversion*
       ``SVN_REPOSITORY <url>``
@@ -407,7 +428,7 @@ External Project Definition
       ``CVS_TAG <tag>``
         Tag to checkout from the CVS repository.
 
-  **Update/Patch Step Options:**
+  **Update Step Options:**
     Whenever CMake is re-run, by default the external project's sources will be
     updated if the download method supports updates (e.g. a git repository
     would be checked if the ``GIT_TAG`` does not refer to a specific commit).
@@ -442,6 +463,7 @@ External Project Definition
       This may cause a step target to be created automatically for the
       ``download`` step.  See policy :policy:`CMP0114`.
 
+  **Patch Step Options:**
     ``PATCH_COMMAND <cmd>...``
       Specifies a custom command to patch the sources after an update. By
       default, no patch command is defined. Note that it can be quite difficult
@@ -509,7 +531,8 @@ External Project Definition
       :manual:`CMake Options <cmake(1)>`).
 
       .. versionadded:: 3.3
-        Arguments may use :manual:`generator expressions <cmake-generator-expressions(7)>`.
+        Arguments may use
+        :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
     ``CMAKE_CACHE_ARGS <arg>...``
       This is an alternate way of specifying cache variables where command line
@@ -520,7 +543,8 @@ External Project Definition
       using the :manual:`cmake -C <cmake(1)>` command line option.
 
       .. versionadded:: 3.3
-        Arguments may use :manual:`generator expressions <cmake-generator-expressions(7)>`.
+        Arguments may use
+        :manual:`generator expressions <cmake-generator-expressions(7)>`.
 
     ``CMAKE_CACHE_DEFAULT_ARGS <arg>...``
       .. versionadded:: 3.2
@@ -533,7 +557,7 @@ External Project Definition
       build directory or re-uses previous build contents.
 
       .. versionadded:: 3.15
-        If the CMake generator is the ``Green Hills MULTI`` and not overridden then
+        If the CMake generator is the ``Green Hills MULTI`` and not overridden,
         the original project's settings for the GHS toolset and target system
         customization cache variables are propagated into the external project.
 
@@ -637,6 +661,22 @@ External Project Definition
       supported). Passing an empty string as the ``<cmd>`` makes the install
       step do nothing.
 
+    .. note::
+      If the :envvar:`CMAKE_INSTALL_MODE` environment variable is set when the
+      main project is built, it will only have an effect if the following
+      conditions are met:
+
+      * The main project's configure step assumed the external project uses
+        CMake as its build system.
+      * The external project's install command actually runs. Note that due
+        to the way ``ExternalProject`` may use timestamps internally, if
+        nothing the install step depends on needs to be re-executed, the
+        install command might also not need to run.
+
+      Note also that ``ExternalProject`` does not check whether the
+      :envvar:`CMAKE_INSTALL_MODE` environment variable changes from one run
+      to another.
+
   **Test Step Options:**
     The test step is only defined if at least one of the following ``TEST_...``
     options are provided.
@@ -734,6 +774,11 @@ External Project Definition
     ``USES_TERMINAL_UPDATE <bool>``
       Give the update step access to the terminal.
 
+    ``USES_TERMINAL_PATCH <bool>``
+      .. versionadded:: 3.23
+
+      Give the patch step access to the terminal.
+
     ``USES_TERMINAL_CONFIGURE <bool>``
       Give the configure step access to the terminal.
 
@@ -785,11 +830,11 @@ External Project Definition
 
   **Miscellaneous Options:**
     ``LIST_SEPARATOR <sep>``
-      For any of the various ``..._COMMAND`` options, replace ``;`` with
-      ``<sep>`` in the specified command lines. This can be useful where list
-      variables may be given in commands where they should end up as
-      space-separated arguments (``<sep>`` would be a single space character
-      string in this case).
+      For any of the various ``..._COMMAND`` options, and ``CMAKE_ARGS``,
+      replace ``;`` with ``<sep>`` in the specified command lines.
+      This can be useful where list variables may be given in commands where
+      they should end up as space-separated arguments (``<sep>`` would be a
+      single space character string in this case).
 
     ``COMMAND <cmd>...``
       Any of the other ``..._COMMAND`` options can have additional commands
@@ -978,9 +1023,9 @@ control needed to implement such step-level capabilities.
 
   .. versionadded:: 3.19
     If :policy:`CMP0114` is set to ``NEW``, step targets are fully responsible
-    for holding the custom commands implementing their steps.  The primary target
-    created by ``ExternalProject_Add`` depends on the step targets, and the
-    step targets depend on each other.  The target-level dependencies match
+    for holding the custom commands implementing their steps.  The primary
+    target created by ``ExternalProject_Add`` depends on the step targets, and
+    the step targets depend on each other.  The target-level dependencies match
     the file-level dependencies used by the custom commands for each step.
     The targets for steps created with :command:`ExternalProject_Add_Step`'s
     ``INDEPENDENT`` option do not depend on the external targets specified
@@ -992,16 +1037,16 @@ control needed to implement such step-level capabilities.
 
   * A deprecated ``NO_DEPENDS`` option may be specified immediately after the
     ``<name>`` and before the first step.
-    If the ``NO_DEPENDS`` option is specified, the step target will not depend on
-    the dependencies of the external project (i.e. on any dependencies of the
+    If the ``NO_DEPENDS`` option is specified, the step target will not depend
+    on the dependencies of the external project (i.e. on any dependencies of the
     ``<name>`` custom target created by :command:`ExternalProject_Add`). This is
-    usually safe for the ``download``, ``update`` and ``patch`` steps, since they
-    do not typically require that the dependencies are updated and built. Using
-    ``NO_DEPENDS`` for any of the other pre-defined steps, however, may break
-    parallel builds. Only use ``NO_DEPENDS`` where it is certain that the named
-    steps genuinely do not have dependencies. For custom steps, consider whether
-    or not the custom commands require the dependencies to be configured, built
-    and installed.
+    usually safe for the ``download``, ``update`` and ``patch`` steps, since
+    they do not typically require that the dependencies are updated and built.
+    Using ``NO_DEPENDS`` for any of the other pre-defined steps, however, may
+    break parallel builds. Only use ``NO_DEPENDS`` where it is certain that the
+    named steps genuinely do not have dependencies. For custom steps, consider
+    whether or not the custom commands require the dependencies to be
+    configured, built and installed.
 
   * The ``INDEPENDENT_STEP_TARGETS`` option for :command:`ExternalProject_Add`,
     or the ``EP_INDEPENDENT_STEP_TARGETS`` directory property, tells the
@@ -1151,7 +1196,13 @@ macro(_ep_get_hash_regex out_var)
   set(${out_var} "^(${${out_var}})=([0-9A-Fa-f]+)$")
 endmacro()
 
-function(_ep_parse_arguments f keywords name ns args)
+function(_ep_parse_arguments
+  f
+  keywords
+  name
+  ns
+  args
+)
   # Transfer the arguments to this function into target properties for the
   # new custom target we just added so that we can set up all the build steps
   # correctly based on target properties.
@@ -1167,7 +1218,8 @@ function(_ep_parse_arguments f keywords name ns args)
     set(is_value 1)
 
     if(arg MATCHES "^[A-Z][A-Z0-9_][A-Z0-9_]+$" AND
-        NOT (("x${arg}x" STREQUAL "x${key}x") AND ("x${key}x" STREQUAL "xCOMMANDx")) AND
+        NOT (("x${arg}x" STREQUAL "x${key}x") AND
+             ("x${key}x" STREQUAL "xCOMMANDx")) AND
         NOT arg MATCHES "^(TRUE|FALSE)$")
       if(arg IN_LIST keywords)
         set(is_value 0)
@@ -1190,7 +1242,9 @@ function(_ep_parse_arguments f keywords name ns args)
         endif()
       else()
         # Missing Keyword
-        message(AUTHOR_WARNING "value '${arg}' with no previous keyword in ${f}")
+        message(AUTHOR_WARNING
+          "value '${arg}' with no previous keyword in ${f}"
+        )
       endif()
     else()
       set(key "${arg}")
@@ -1199,46 +1253,32 @@ function(_ep_parse_arguments f keywords name ns args)
 endfunction()
 
 
-define_property(DIRECTORY PROPERTY "EP_BASE" INHERITED
-  BRIEF_DOCS "Base directory for External Project storage."
-  FULL_DOCS
-  "See documentation of the ExternalProject_Add() function in the "
-  "ExternalProject module."
-  )
+define_property(DIRECTORY PROPERTY "EP_BASE" INHERITED)
+define_property(DIRECTORY PROPERTY "EP_PREFIX" INHERITED)
+define_property(DIRECTORY PROPERTY "EP_STEP_TARGETS" INHERITED)
+define_property(DIRECTORY PROPERTY "EP_INDEPENDENT_STEP_TARGETS" INHERITED)
+define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED)
 
-define_property(DIRECTORY PROPERTY "EP_PREFIX" INHERITED
-  BRIEF_DOCS "Top prefix for External Project storage."
-  FULL_DOCS
-  "See documentation of the ExternalProject_Add() function in the "
-  "ExternalProject module."
-  )
+function(_ep_write_gitclone_script
+  script_filename
+  source_dir
+  git_EXECUTABLE
+  git_repository
+  git_tag
+  git_remote_name
+  init_submodules
+  git_submodules_recurse
+  git_submodules
+  git_shallow
+  git_progress
+  git_config
+  src_name
+  work_dir
+  gitclone_infofile
+  gitclone_stampfile
+  tls_verify
+)
 
-define_property(DIRECTORY PROPERTY "EP_STEP_TARGETS" INHERITED
-  BRIEF_DOCS
-  "List of ExternalProject steps that automatically get corresponding targets"
-  FULL_DOCS
-  "These targets will be dependent on the main target dependencies. "
-  "See documentation of the ExternalProject_Add_StepTargets() function in the "
-  "ExternalProject module."
-  )
-
-define_property(DIRECTORY PROPERTY "EP_INDEPENDENT_STEP_TARGETS" INHERITED
-  BRIEF_DOCS
-  "List of ExternalProject steps that automatically get corresponding targets"
-  FULL_DOCS
-  "These targets will not be dependent on the main target dependencies. "
-  "See documentation of the ExternalProject_Add_StepTargets() function in the "
-  "ExternalProject module."
-  )
-
-define_property(DIRECTORY PROPERTY "EP_UPDATE_DISCONNECTED" INHERITED
-  BRIEF_DOCS "Never update automatically from the remote repo."
-  FULL_DOCS
-  "See documentation of the ExternalProject_Add() function in the "
-  "ExternalProject module."
-  )
-
-function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git_repository git_tag git_remote_name init_submodules git_submodules_recurse git_submodules git_shallow git_progress git_config src_name work_dir gitclone_infofile gitclone_stampfile tls_verify)
   if(NOT GIT_VERSION_STRING VERSION_LESS 1.8.5)
     # Use `git checkout <tree-ish> --` to avoid ambiguity with a local path.
     set(git_checkout_explicit-- "--")
@@ -1252,7 +1292,8 @@ function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git
     message(FATAL_ERROR "Tag for git checkout should not be empty.")
   endif()
 
-  if(GIT_VERSION_STRING VERSION_LESS 2.20 OR 2.21 VERSION_LESS_EQUAL GIT_VERSION_STRING)
+  if(GIT_VERSION_STRING VERSION_LESS 2.20 OR
+     2.21 VERSION_LESS_EQUAL GIT_VERSION_STRING)
     set(git_clone_options "--no-checkout")
   else()
     set(git_clone_options)
@@ -1280,138 +1321,55 @@ function(_ep_write_gitclone_script script_filename source_dir git_EXECUTABLE git
   # disable cert checking if explicitly told not to do it
   if(NOT "x${tls_verify}" STREQUAL "x" AND NOT tls_verify)
     set(git_options
-      -c http.sslVerify=false)
+      -c http.sslVerify=false
+    )
   endif()
   string (REPLACE ";" " " git_options "${git_options}")
 
-  file(WRITE ${script_filename}
-"
-if(NOT \"${gitclone_infofile}\" IS_NEWER_THAN \"${gitclone_stampfile}\")
-  message(STATUS \"Avoiding repeated git clone, stamp file is up to date: '${gitclone_stampfile}'\")
-  return()
-endif()
-
-execute_process(
-  COMMAND \${CMAKE_COMMAND} -E rm -rf \"${source_dir}\"
-  RESULT_VARIABLE error_code
+  configure_file(
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/gitclone.cmake.in
+    ${script_filename}
+    @ONLY
   )
-if(error_code)
-  message(FATAL_ERROR \"Failed to remove directory: '${source_dir}'\")
-endif()
-
-# try the clone 3 times in case there is an odd git clone issue
-set(error_code 1)
-set(number_of_tries 0)
-while(error_code AND number_of_tries LESS 3)
-  execute_process(
-    COMMAND \"${git_EXECUTABLE}\" ${git_options} clone ${git_clone_options} \"${git_repository}\" \"${src_name}\"
-    WORKING_DIRECTORY \"${work_dir}\"
-    RESULT_VARIABLE error_code
-    )
-  math(EXPR number_of_tries \"\${number_of_tries} + 1\")
-endwhile()
-if(number_of_tries GREATER 1)
-  message(STATUS \"Had to git clone more than once:
-          \${number_of_tries} times.\")
-endif()
-if(error_code)
-  message(FATAL_ERROR \"Failed to clone repository: '${git_repository}'\")
-endif()
-
-execute_process(
-  COMMAND \"${git_EXECUTABLE}\" ${git_options} checkout ${git_tag} ${git_checkout_explicit--}
-  WORKING_DIRECTORY \"${work_dir}/${src_name}\"
-  RESULT_VARIABLE error_code
-  )
-if(error_code)
-  message(FATAL_ERROR \"Failed to checkout tag: '${git_tag}'\")
-endif()
-
-set(init_submodules ${init_submodules})
-if(init_submodules)
-  execute_process(
-    COMMAND \"${git_EXECUTABLE}\" ${git_options} submodule update ${git_submodules_recurse} --init ${git_submodules}
-    WORKING_DIRECTORY \"${work_dir}/${src_name}\"
-    RESULT_VARIABLE error_code
-    )
-endif()
-if(error_code)
-  message(FATAL_ERROR \"Failed to update submodules in: '${work_dir}/${src_name}'\")
-endif()
-
-# Complete success, update the script-last-run stamp file:
-#
-execute_process(
-  COMMAND \${CMAKE_COMMAND} -E copy
-    \"${gitclone_infofile}\"
-    \"${gitclone_stampfile}\"
-  RESULT_VARIABLE error_code
-  )
-if(error_code)
-  message(FATAL_ERROR \"Failed to copy script-last-run stamp file: '${gitclone_stampfile}'\")
-endif()
-
-"
-)
-
 endfunction()
 
-function(_ep_write_hgclone_script script_filename source_dir hg_EXECUTABLE hg_repository hg_tag src_name work_dir hgclone_infofile hgclone_stampfile)
+function(_ep_write_hgclone_script
+  script_filename
+  source_dir
+  hg_EXECUTABLE
+  hg_repository
+  hg_tag
+  src_name
+  work_dir
+  hgclone_infofile
+  hgclone_stampfile
+)
+
   if("${hg_tag}" STREQUAL "")
     message(FATAL_ERROR "Tag for hg checkout should not be empty.")
   endif()
-  file(WRITE ${script_filename}
-"
-if(NOT \"${hgclone_infofile}\" IS_NEWER_THAN \"${hgclone_stampfile}\")
-  message(STATUS \"Avoiding repeated hg clone, stamp file is up to date: '${hgclone_stampfile}'\")
-  return()
-endif()
 
-execute_process(
-  COMMAND \${CMAKE_COMMAND} -E rm -rf \"${source_dir}\"
-  RESULT_VARIABLE error_code
+  configure_file(
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/hgclone.cmake.in
+    ${script_filename}
+    @ONLY
   )
-if(error_code)
-  message(FATAL_ERROR \"Failed to remove directory: '${source_dir}'\")
-endif()
-
-execute_process(
-  COMMAND \"${hg_EXECUTABLE}\" clone -U \"${hg_repository}\" \"${src_name}\"
-  WORKING_DIRECTORY \"${work_dir}\"
-  RESULT_VARIABLE error_code
-  )
-if(error_code)
-  message(FATAL_ERROR \"Failed to clone repository: '${hg_repository}'\")
-endif()
-
-execute_process(
-  COMMAND \"${hg_EXECUTABLE}\" update ${hg_tag}
-  WORKING_DIRECTORY \"${work_dir}/${src_name}\"
-  RESULT_VARIABLE error_code
-  )
-if(error_code)
-  message(FATAL_ERROR \"Failed to checkout tag: '${hg_tag}'\")
-endif()
-
-# Complete success, update the script-last-run stamp file:
-#
-execute_process(
-  COMMAND \${CMAKE_COMMAND} -E copy
-    \"${hgclone_infofile}\"
-    \"${hgclone_stampfile}\"
-  RESULT_VARIABLE error_code
-  )
-if(error_code)
-  message(FATAL_ERROR \"Failed to copy script-last-run stamp file: '${hgclone_stampfile}'\")
-endif()
-
-"
-)
-
 endfunction()
 
 
-function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_remote_name init_submodules git_submodules_recurse git_submodules git_repository work_dir git_update_strategy)
+function(_ep_write_gitupdate_script
+  script_filename
+  git_EXECUTABLE
+  git_tag
+  git_remote_name
+  init_submodules
+  git_submodules_recurse
+  git_submodules
+  git_repository
+  work_dir
+  git_update_strategy
+)
+
   if("${git_tag}" STREQUAL "")
     message(FATAL_ERROR "Tag for git checkout should not be empty.")
   endif()
@@ -1425,13 +1383,27 @@ function(_ep_write_gitupdate_script script_filename git_EXECUTABLE git_tag git_r
   endif()
 
   configure_file(
-      "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject-gitupdate.cmake.in"
+      "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/gitupdate.cmake.in"
       "${script_filename}"
       @ONLY
   )
 endfunction()
 
-function(_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout inactivity_timeout no_progress hash tls_verify tls_cainfo userpwd http_headers netrc netrc_file)
+function(_ep_write_downloadfile_script
+  script_filename
+  REMOTE
+  LOCAL
+  timeout
+  inactivity_timeout
+  no_progress
+  hash
+  tls_verify
+  tls_cainfo
+  userpwd
+  http_headers
+  netrc
+  netrc_file
+)
   if(timeout)
     set(TIMEOUT_ARGS TIMEOUT ${timeout})
     set(TIMEOUT_MSG "${timeout} seconds")
@@ -1447,7 +1419,6 @@ function(_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout inac
     set(INACTIVITY_TIMEOUT_MSG "none")
   endif()
 
-
   if(no_progress)
     set(SHOW_PROGRESS "")
   else()
@@ -1515,9 +1486,8 @@ function(_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout inac
   set(HTTP_HEADERS_ARGS "")
   if(NOT http_headers STREQUAL "")
     foreach(header ${http_headers})
-      set(
-          HTTP_HEADERS_ARGS
-          "HTTPHEADER \"${header}\"\n        ${HTTP_HEADERS_ARGS}"
+      string(PREPEND HTTP_HEADERS_ARGS
+        "HTTPHEADER \"${header}\"\n        "
       )
     endforeach()
   endif()
@@ -1535,13 +1505,17 @@ function(_ep_write_downloadfile_script script_filename REMOTE LOCAL timeout inac
   # * USERPWD_ARGS
   # * HTTP_HEADERS_ARGS
   configure_file(
-      "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject-download.cmake.in"
-      "${script_filename}"
-      @ONLY
+    "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/download.cmake.in"
+    "${script_filename}"
+    @ONLY
   )
 endfunction()
 
-function(_ep_write_verifyfile_script script_filename LOCAL hash)
+function(_ep_write_verifyfile_script
+  script_filename
+  LOCAL
+  hash
+)
   _ep_get_hash_regex(_ep_hash_regex)
   if("${hash}" MATCHES "${_ep_hash_regex}")
     set(ALGO "${CMAKE_MATCH_1}")
@@ -1556,17 +1530,23 @@ function(_ep_write_verifyfile_script script_filename LOCAL hash)
   # * EXPECT_VALUE
   # * LOCAL
   configure_file(
-      "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject-verify.cmake.in"
-      "${script_filename}"
-      @ONLY
+    "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/verify.cmake.in"
+    "${script_filename}"
+    @ONLY
   )
 endfunction()
 
 
-function(_ep_write_extractfile_script script_filename name filename directory)
+function(_ep_write_extractfile_script
+  script_filename
+  name
+  filename
+  directory options
+)
   set(args "")
 
-  if(filename MATCHES "(\\.|=)(7z|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
+  if(filename MATCHES
+     "(\\.|=)(7z|tar\\.bz2|tar\\.gz|tar\\.xz|tbz2|tgz|txz|zip)$")
     set(args xfz)
   endif()
 
@@ -1575,72 +1555,17 @@ function(_ep_write_extractfile_script script_filename name filename directory)
   endif()
 
   if(args STREQUAL "")
-    message(SEND_ERROR "error: do not know how to extract '${filename}' -- known types are .7z, .tar, .tar.bz2, .tar.gz, .tar.xz, .tbz2, .tgz, .txz and .zip")
-    return()
+    message(FATAL_ERROR
+      "Do not know how to extract '${filename}' -- known types are: "
+      ".7z, .tar, .tar.bz2, .tar.gz, .tar.xz, .tbz2, .tgz, .txz and .zip"
+    )
   endif()
 
-  file(WRITE ${script_filename}
-"# Make file names absolute:
-#
-get_filename_component(filename \"${filename}\" ABSOLUTE)
-get_filename_component(directory \"${directory}\" ABSOLUTE)
-
-message(STATUS \"extracting...
-     src='\${filename}'
-     dst='\${directory}'\")
-
-if(NOT EXISTS \"\${filename}\")
-  message(FATAL_ERROR \"error: file to extract does not exist: '\${filename}'\")
-endif()
-
-# Prepare a space for extracting:
-#
-set(i 1234)
-while(EXISTS \"\${directory}/../ex-${name}\${i}\")
-  math(EXPR i \"\${i} + 1\")
-endwhile()
-set(ut_dir \"\${directory}/../ex-${name}\${i}\")
-file(MAKE_DIRECTORY \"\${ut_dir}\")
-
-# Extract it:
-#
-message(STATUS \"extracting... [tar ${args}]\")
-execute_process(COMMAND \${CMAKE_COMMAND} -E tar ${args} \${filename}
-  WORKING_DIRECTORY \${ut_dir}
-  RESULT_VARIABLE rv)
-
-if(NOT rv EQUAL 0)
-  message(STATUS \"extracting... [error clean up]\")
-  file(REMOVE_RECURSE \"\${ut_dir}\")
-  message(FATAL_ERROR \"error: extract of '\${filename}' failed\")
-endif()
-
-# Analyze what came out of the tar file:
-#
-message(STATUS \"extracting... [analysis]\")
-file(GLOB contents \"\${ut_dir}/*\")
-list(REMOVE_ITEM contents \"\${ut_dir}/.DS_Store\")
-list(LENGTH contents n)
-if(NOT n EQUAL 1 OR NOT IS_DIRECTORY \"\${contents}\")
-  set(contents \"\${ut_dir}\")
-endif()
-
-# Move \"the one\" directory to the final directory:
-#
-message(STATUS \"extracting... [rename]\")
-file(REMOVE_RECURSE \${directory})
-get_filename_component(contents \${contents} ABSOLUTE)
-file(RENAME \${contents} \${directory})
-
-# Clean up:
-#
-message(STATUS \"extracting... [clean up]\")
-file(REMOVE_RECURSE \"\${ut_dir}\")
-
-message(STATUS \"extracting... done\")
-"
-)
-
+  configure_file(
+    "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/extractfile.cmake.in"
+    "${script_filename}"
+    @ONLY
+  )
 endfunction()
 
 
@@ -1656,6 +1581,7 @@ function(_ep_set_directories name)
     endif()
   endif()
   if(prefix)
+    file(TO_CMAKE_PATH "${prefix}" prefix)
     set(tmp_default "${prefix}/tmp")
     set(download_default "${prefix}/src")
     set(source_default "${prefix}/src/${name}")
@@ -1663,6 +1589,7 @@ function(_ep_set_directories name)
     set(stamp_default "${prefix}/src/${name}-stamp")
     set(install_default "${prefix}")
   else()
+    file(TO_CMAKE_PATH "${base}" base)
     set(tmp_default "${base}/tmp/${name}")
     set(download_default "${base}/Download/${name}")
     set(source_default "${base}/Source/${name}")
@@ -1675,7 +1602,8 @@ function(_ep_set_directories name)
     get_property(have_binary_dir TARGET ${name} PROPERTY _EP_BINARY_DIR SET)
     if(have_binary_dir)
       message(FATAL_ERROR
-        "External project ${name} has both BINARY_DIR and BUILD_IN_SOURCE!")
+        "External project ${name} has both BINARY_DIR and BUILD_IN_SOURCE!"
+      )
     endif()
   endif()
   set(top "${CMAKE_CURRENT_BINARY_DIR}")
@@ -1691,6 +1619,7 @@ function(_ep_set_directories name)
     if(NOT IS_ABSOLUTE "${${var}_dir}")
       get_filename_component(${var}_dir "${top}/${${var}_dir}" ABSOLUTE)
     endif()
+    file(TO_CMAKE_PATH "${${var}_dir}" ${var}_dir)
     set_property(TARGET ${name} PROPERTY _EP_${VAR}_DIR "${${var}_dir}")
   endforeach()
 
@@ -1702,6 +1631,7 @@ function(_ep_set_directories name)
   if(NOT IS_ABSOLUTE "${log_dir}")
     get_filename_component(log_dir "${top}/${log_dir}" ABSOLUTE)
   endif()
+  file(TO_CMAKE_PATH "${log_dir}" log_dir)
   set_property(TARGET ${name} PROPERTY _EP_LOG_DIR "${log_dir}")
 
   get_property(source_subdir TARGET ${name} PROPERTY _EP_SOURCE_SUBDIR)
@@ -1709,37 +1639,41 @@ function(_ep_set_directories name)
     set_property(TARGET ${name} PROPERTY _EP_SOURCE_SUBDIR "")
   elseif(IS_ABSOLUTE "${source_subdir}")
     message(FATAL_ERROR
-      "External project ${name} has non-relative SOURCE_SUBDIR!")
+      "External project ${name} has non-relative SOURCE_SUBDIR!"
+    )
   else()
     # Prefix with a slash so that when appended to the source directory, it
     # behaves as expected.
+    file(TO_CMAKE_PATH "${source_subdir}" source_subdir)
     set_property(TARGET ${name} PROPERTY _EP_SOURCE_SUBDIR "/${source_subdir}")
   endif()
   if(build_in_source)
     get_property(source_dir TARGET ${name} PROPERTY _EP_SOURCE_DIR)
     if(source_subdir)
-      set_property(TARGET ${name} PROPERTY _EP_BINARY_DIR "${source_dir}/${source_subdir}")
+      set_property(TARGET ${name} PROPERTY
+        _EP_BINARY_DIR "${source_dir}/${source_subdir}"
+      )
     else()
-      set_property(TARGET ${name} PROPERTY _EP_BINARY_DIR "${source_dir}")
+      set_property(TARGET ${name} PROPERTY
+        _EP_BINARY_DIR "${source_dir}"
+      )
     endif()
   endif()
 
-  # Make the directories at CMake configure time *and* add a custom command
-  # to make them at build time. They need to exist at makefile generation
-  # time for Borland make and wmake so that CMake may generate makefiles
-  # with "cd C:\short\paths\with\no\spaces" commands in them.
-  #
-  # Additionally, the add_custom_command is still used in case somebody
-  # removes one of the necessary directories and tries to rebuild without
-  # re-running cmake.
-  foreach(var ${places})
-    string(TOUPPER "${var}" VAR)
-    get_property(dir TARGET ${name} PROPERTY _EP_${VAR}_DIR)
-    file(MAKE_DIRECTORY "${dir}")
-    if(NOT EXISTS "${dir}")
-      message(FATAL_ERROR "dir '${dir}' does not exist after file(MAKE_DIRECTORY)")
-    endif()
-  endforeach()
+  # This script will be used both here and by the mkdir step. We create the
+  # directories now at configure time and ensure they exist again at build
+  # time (since somebody might remove one of the required directories and try
+  # to rebuild without re-running cmake). They need to exist now at makefile
+  # generation time for Borland make and wmake so that CMake may generate
+  # makefiles with "cd C:\short\paths\with\no\spaces" commands in them.
+  set(script_filename "${tmp_dir}/${name}-mkdirs.cmake")
+  configure_file(
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/mkdirs.cmake.in
+    ${script_filename}
+    @ONLY
+  )
+  unset(cfgdir) # do not leak into mkdirs.cmake script
+  include(${script_filename})
 endfunction()
 
 
@@ -1750,7 +1684,16 @@ macro(_ep_replace_location_tags target_name)
   set(vars ${ARGN})
   foreach(var ${vars})
     if(${var})
-      foreach(dir SOURCE_DIR SOURCE_SUBDIR BINARY_DIR INSTALL_DIR TMP_DIR DOWNLOAD_DIR DOWNLOADED_FILE LOG_DIR)
+      foreach(dir
+        SOURCE_DIR
+        SOURCE_SUBDIR
+        BINARY_DIR
+        INSTALL_DIR
+        TMP_DIR
+        DOWNLOAD_DIR
+        DOWNLOADED_FILE
+        LOG_DIR
+      )
         get_property(val TARGET ${target_name} PROPERTY _EP_${dir})
         string(REPLACE "<${dir}>" "${val}" ${var} "${${var}}")
       endforeach()
@@ -1759,7 +1702,11 @@ macro(_ep_replace_location_tags target_name)
 endmacro()
 
 
-function(_ep_command_line_to_initial_cache var args force)
+function(_ep_command_line_to_initial_cache
+  var
+  args
+  force
+)
   set(script_initial_cache "")
   set(regex "^([^:]+):([^=]+)=(.*)$")
   set(setArg "")
@@ -1772,7 +1719,9 @@ function(_ep_command_line_to_initial_cache var args force)
       set(line "${CMAKE_MATCH_1}")
       if(NOT "${setArg}" STREQUAL "")
         # This is required to build up lists in variables, or complete an entry
-        string(APPEND setArg "${accumulator}\" CACHE ${type} \"Initial cache\" ${forceArg})")
+        string(APPEND setArg
+          "${accumulator}\" CACHE ${type} \"Initial cache\" ${forceArg})"
+        )
         string(APPEND script_initial_cache "\n${setArg}")
         set(accumulator "")
         set(setArg "")
@@ -1792,14 +1741,20 @@ function(_ep_command_line_to_initial_cache var args force)
   endforeach()
   # Catch the final line of the args
   if(NOT "${setArg}" STREQUAL "")
-    string(APPEND setArg "${accumulator}\" CACHE ${type} \"Initial cache\" ${forceArg})")
+    string(APPEND setArg
+      "${accumulator}\" CACHE ${type} \"Initial cache\" ${forceArg})"
+    )
     string(APPEND script_initial_cache "\n${setArg}")
   endif()
   set(${var} ${script_initial_cache} PARENT_SCOPE)
 endfunction()
 
 
-function(_ep_write_initial_cache target_name script_filename script_initial_cache)
+function(_ep_write_initial_cache
+  target_name
+  script_filename
+  script_initial_cache
+)
   # Write out values into an initial cache, that will be passed to CMake with -C
   # Replace location tags.
   _ep_replace_location_tags(${target_name} script_initial_cache)
@@ -1827,7 +1782,10 @@ function(ExternalProject_Get_Property name)
 endfunction()
 
 
-function(_ep_get_configure_command_id name cfg_cmd_id_var)
+function(_ep_get_configure_command_id
+  name
+  cfg_cmd_id_var
+)
   get_target_property(cmd ${name} _EP_CONFIGURE_COMMAND)
 
   if(cmd STREQUAL "")
@@ -1853,7 +1811,11 @@ function(_ep_get_configure_command_id name cfg_cmd_id_var)
 endfunction()
 
 
-function(_ep_get_build_command name step cmd_var)
+function(_ep_get_build_command
+  name
+  step
+  cmd_var
+)
   set(cmd "")
   set(args)
   _ep_get_configure_command_id(${name} cfg_cmd_id)
@@ -1878,7 +1840,11 @@ function(_ep_get_build_command name step cmd_var)
       else()
         set(cmd "${CMAKE_COMMAND}")
       endif()
-      set(args --build ".")
+      if(step STREQUAL "INSTALL")
+        set(args --install ".")
+      else()
+        set(args --build ".")
+      endif()
       get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
       if(_isMultiConfig)
         if (CMAKE_CFG_INTDIR AND
@@ -1891,16 +1857,15 @@ function(_ep_get_build_command name step cmd_var)
           # BUILD_COMMAND to change the default command instead, but for
           # compatibility honor the value.
           set(config ${CMAKE_CFG_INTDIR})
-          message(AUTHOR_WARNING "CMAKE_CFG_INTDIR should not be set by project code.\n"
-            "To get a non-default build command, use the BUILD_COMMAND option.")
+          message(AUTHOR_WARNING
+            "CMAKE_CFG_INTDIR should not be set by project code.\n"
+            "To get a non-default build command, use the BUILD_COMMAND option."
+          )
         else()
           set(config $<CONFIG>)
         endif()
         list(APPEND args --config ${config})
       endif()
-      if(step STREQUAL "INSTALL")
-        list(APPEND args --target install)
-      endif()
       # But for "TEST" drive the project with corresponding "ctest".
       if("x${step}x" STREQUAL "xTESTx")
         string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd "${cmd}")
@@ -1940,7 +1905,11 @@ function(_ep_get_build_command name step cmd_var)
   set(${cmd_var} "${cmd}" PARENT_SCOPE)
 endfunction()
 
-function(_ep_write_log_script name step cmd_var)
+function(_ep_write_log_script
+  name
+  step
+  cmd_var
+)
   ExternalProject_Get_Property(${name} log_dir)
   ExternalProject_Get_Property(${name} stamp_dir)
   set(command "${${cmd_var}}")
@@ -2007,15 +1976,29 @@ endif()
       endif()
     endforeach()
     string(APPEND code "set(command \"${cmd}\")${code_execute_process}")
-    file(GENERATE OUTPUT "${stamp_dir}/${name}-${step}-$<CONFIG>-impl.cmake" CONTENT "${code}")
-    set(command ${CMAKE_COMMAND} "-Dmake=\${make}" "-Dconfig=\${config}" -P ${stamp_dir}/${name}-${step}-$<CONFIG>-impl.cmake)
+    file(GENERATE
+      OUTPUT "${stamp_dir}/${name}-${step}-$<CONFIG>-impl.cmake"
+      CONTENT "${code}"
+    )
+    set(command
+      ${CMAKE_COMMAND}
+      "-Dmake=\${make}"
+      "-Dconfig=\${config}"
+      -P ${stamp_dir}/${name}-${step}-$<CONFIG>-impl.cmake
+    )
   endif()
 
   # Wrap the command in a script to log output to files.
   set(script ${stamp_dir}/${name}-${step}-$<CONFIG>.cmake)
   set(logbase ${log_dir}/${name}-${step})
-  get_property(log_merged TARGET ${name} PROPERTY _EP_LOG_MERGED_STDOUTERR)
-  get_property(log_output_on_failure TARGET ${name} PROPERTY _EP_LOG_OUTPUT_ON_FAILURE)
+  get_property(log_merged
+    TARGET ${name}
+    PROPERTY _EP_LOG_MERGED_STDOUTERR
+  )
+  get_property(log_output_on_failure
+    TARGET ${name}
+    PROPERTY _EP_LOG_OUTPUT_ON_FAILURE
+  )
   if (log_merged)
     set(stdout_log "${logbase}.log")
     set(stderr_log "${logbase}.log")
@@ -2036,7 +2019,7 @@ execute_process(
   RESULT_VARIABLE result
   OUTPUT_FILE \"\${stdout_log}\"
   ERROR_FILE \"\${stderr_log}\"
-  )
+)
 macro(read_up_to_max_size log_file output_var)
   file(SIZE \${log_file} determined_size)
   set(max_size 10240)
@@ -2085,44 +2068,55 @@ endif()
   set(${cmd_var} "${command}" PARENT_SCOPE)
 endfunction()
 
-# This module used to use "/${CMAKE_CFG_INTDIR}" directly and produced
-# makefiles with "/./" in paths for custom command dependencies. Which
-# resulted in problems with parallel make -j invocations.
-#
-# This function was added so that the suffix (search below for ${cfgdir}) is
-# only set to "/${CMAKE_CFG_INTDIR}" when ${CMAKE_CFG_INTDIR} is not going to
-# be "." (multi-configuration build systems like Visual Studio and Xcode...)
-#
-function(_ep_get_configuration_subdir_suffix suffix_var)
+# On multi-config generators, provide a placeholder for a per-config subdir.
+# On single-config generators, this is empty.
+function(_ep_get_configuration_subdir_genex suffix_var)
   set(suffix "")
   get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
   if(_isMultiConfig)
-    set(suffix "/${CMAKE_CFG_INTDIR}")
+    if(CMAKE_GENERATOR STREQUAL "Xcode")
+      # The Xcode generator does not support per-config sources,
+      # so use the underlying build system's placeholder instead.
+      set(suffix "/${CMAKE_CFG_INTDIR}")
+    else()
+      set(suffix "/$<CONFIG>")
+    endif()
   endif()
   set(${suffix_var} "${suffix}" PARENT_SCOPE)
 endfunction()
 
 
-function(_ep_get_step_stampfile name step stampfile_var)
+function(_ep_get_step_stampfile
+  name
+  step
+  stampfile_var
+)
   ExternalProject_Get_Property(${name} stamp_dir)
 
-  _ep_get_configuration_subdir_suffix(cfgdir)
+  _ep_get_configuration_subdir_genex(cfgdir)
   set(stampfile "${stamp_dir}${cfgdir}/${name}-${step}")
 
   set(${stampfile_var} "${stampfile}" PARENT_SCOPE)
 endfunction()
 
 
-function(_ep_get_complete_stampfile name stampfile_var)
+function(_ep_get_complete_stampfile
+  name
+  stampfile_var
+)
   set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
-  _ep_get_configuration_subdir_suffix(cfgdir)
+  _ep_get_configuration_subdir_genex(cfgdir)
   set(stampfile "${cmf_dir}${cfgdir}/${name}-complete")
 
   set(${stampfile_var} ${stampfile} PARENT_SCOPE)
 endfunction()
 
 
-function(_ep_step_add_target name step no_deps)
+function(_ep_step_add_target
+  name
+  step
+  no_deps
+)
   if(TARGET ${name}-${step})
     return()
   endif()
@@ -2134,16 +2128,20 @@ function(_ep_step_add_target name step no_deps)
     # we need CMP0113 NEW behavior.
     cmake_policy(SET CMP0113 NEW)
   endif()
-  add_custom_target(${name}-${step}
-    DEPENDS ${stamp_file})
+  add_custom_target(${name}-${step} DEPENDS ${stamp_file})
   cmake_policy(POP)
-  set_property(TARGET ${name}-${step} PROPERTY _EP_IS_EXTERNAL_PROJECT_STEP 1)
-  set_property(TARGET ${name}-${step} PROPERTY LABELS ${name})
-  set_property(TARGET ${name}-${step} PROPERTY FOLDER "ExternalProjectTargets/${name}")
+  set_target_properties(${name}-${step} PROPERTIES
+    _EP_IS_EXTERNAL_PROJECT_STEP 1
+    LABELS "${name}"
+    FOLDER "ExternalProjectTargets/${name}"
+  )
 
   if(cmp0114 STREQUAL "NEW")
     # Add target-level dependencies for the step.
-    get_property(exclude_from_main TARGET ${name} PROPERTY _EP_${step}_EXCLUDE_FROM_MAIN)
+    get_property(exclude_from_main
+      TARGET ${name}
+      PROPERTY _EP_${step}_EXCLUDE_FROM_MAIN
+    )
     if(NOT exclude_from_main)
       add_dependencies(${name} ${name}-${step})
     endif()
@@ -2153,7 +2151,9 @@ function(_ep_step_add_target name step no_deps)
     get_property(independent TARGET ${name} PROPERTY _EP_${step}_INDEPENDENT)
   else()
     if(no_deps AND "${step}" MATCHES "^(configure|build|install|test)$")
-      message(AUTHOR_WARNING "Using NO_DEPENDS for \"${step}\" step  might break parallel builds")
+      message(AUTHOR_WARNING
+        "Using NO_DEPENDS for \"${step}\" step  might break parallel builds"
+      )
     endif()
     set(independent ${no_deps})
   endif()
@@ -2168,12 +2168,25 @@ function(_ep_step_add_target name step no_deps)
 endfunction()
 
 
-function(_ep_step_add_target_dependencies name step node)
-  get_property(dependees TARGET ${name} PROPERTY _EP_${node}_INTERNAL_DEPENDEES)
+function(_ep_step_add_target_dependencies
+  name
+  step
+  node
+)
+  get_property(dependees
+    TARGET ${name}
+    PROPERTY _EP_${node}_INTERNAL_DEPENDEES
+  )
   list(REMOVE_DUPLICATES dependees)
   foreach(dependee IN LISTS dependees)
-    get_property(exclude_from_main TARGET ${name} PROPERTY _EP_${step}_EXCLUDE_FROM_MAIN)
-    get_property(dependee_dependers TARGET ${name} PROPERTY _EP_${dependee}_INTERNAL_DEPENDERS)
+    get_property(exclude_from_main
+      TARGET ${name}
+      PROPERTY _EP_${step}_EXCLUDE_FROM_MAIN
+    )
+    get_property(dependee_dependers
+      TARGET ${name}
+      PROPERTY _EP_${dependee}_INTERNAL_DEPENDERS
+    )
     if(exclude_from_main OR dependee_dependers MATCHES ";")
       # The step on which our step target depends itself has
       # dependents in multiple targes.  It needs a step target too
@@ -2190,8 +2203,15 @@ function(_ep_step_add_target_dependencies name step node)
 endfunction()
 
 
-function(_ep_step_add_target_dependents name step node)
-  get_property(dependers TARGET ${name} PROPERTY _EP_${node}_INTERNAL_DEPENDERS)
+function(_ep_step_add_target_dependents
+  name
+  step
+  node
+)
+  get_property(dependers
+    TARGET ${name}
+    PROPERTY _EP_${node}_INTERNAL_DEPENDERS
+  )
   list(REMOVE_DUPLICATES dependers)
   foreach(depender IN LISTS dependers)
     if(TARGET ${name}-${depender})
@@ -2218,7 +2238,7 @@ function(ExternalProject_Add_StepTargets name)
         "The 'NO_DEPENDS' option is no longer allowed.  "
         "It has been superseded by the per-step 'INDEPENDENT' option.  "
         "See policy CMP0114."
-        )
+      )
     endif()
   elseif(cmp0114 STREQUAL "")
     cmake_policy(GET_WARNING CMP0114 _cmp0114_warning)
@@ -2226,11 +2246,11 @@ function(ExternalProject_Add_StepTargets name)
       "ExternalProject target '${name}' would depend on the targets for "
       "step(s) '${steps}' under policy CMP0114, but this is being left out "
       "for compatibility since the policy is not set."
-      )
+    )
     if(no_deps)
-      string(APPEND _cmp0114_warning
-        "  Also, the NO_DEPENDS option is deprecated in favor of policy CMP0114."
-        )
+      string(APPEND _cmp0114_warning "  "
+        "Also, the NO_DEPENDS option is deprecated in favor of policy CMP0114."
+      )
     endif()
     message(AUTHOR_WARNING "${_cmp0114_warning}")
   endif()
@@ -2259,38 +2279,60 @@ function(ExternalProject_Add_Step name step)
     LOG
     USES_TERMINAL
   )
-  _ep_parse_arguments(ExternalProject_Add_Step "${keywords}"
-                      ${name} _EP_${step}_ "${ARGN}")
+  _ep_parse_arguments(
+    ExternalProject_Add_Step
+    "${keywords}"
+    ${name}
+    _EP_${step}_
+    "${ARGN}"
+  )
 
-  get_property(independent TARGET ${name} PROPERTY _EP_${step}_INDEPENDENT)
+  get_property(independent
+    TARGET ${name}
+    PROPERTY _EP_${step}_INDEPENDENT
+  )
   if(independent STREQUAL "")
     set(independent FALSE)
-    set_property(TARGET ${name} PROPERTY _EP_${step}_INDEPENDENT "${independent}")
+    set_property(TARGET ${name} PROPERTY
+      _EP_${step}_INDEPENDENT "${independent}"
+    )
   endif()
 
-  get_property(exclude_from_main TARGET ${name} PROPERTY _EP_${step}_EXCLUDE_FROM_MAIN)
+  get_property(exclude_from_main
+    TARGET ${name}
+    PROPERTY _EP_${step}_EXCLUDE_FROM_MAIN
+  )
   if(NOT exclude_from_main)
     add_custom_command(APPEND
       OUTPUT ${complete_stamp_file}
       DEPENDS ${stamp_file}
-      )
+    )
   endif()
 
   # Steps depending on this step.
   get_property(dependers TARGET ${name} PROPERTY _EP_${step}_DEPENDERS)
-  set_property(TARGET ${name} APPEND PROPERTY _EP_${step}_INTERNAL_DEPENDERS ${dependers})
+  set_property(TARGET ${name} APPEND PROPERTY
+    _EP_${step}_INTERNAL_DEPENDERS ${dependers}
+  )
   foreach(depender IN LISTS dependers)
-    set_property(TARGET ${name} APPEND PROPERTY _EP_${depender}_INTERNAL_DEPENDEES ${step})
+    set_property(TARGET ${name} APPEND PROPERTY
+      _EP_${depender}_INTERNAL_DEPENDEES ${step}
+    )
     _ep_get_step_stampfile(${name} ${depender} depender_stamp_file)
     add_custom_command(APPEND
       OUTPUT ${depender_stamp_file}
       DEPENDS ${stamp_file}
-      )
+    )
     if(cmp0114 STREQUAL "NEW" AND NOT independent)
-      get_property(dep_independent TARGET ${name} PROPERTY _EP_${depender}_INDEPENDENT)
+      get_property(dep_independent
+        TARGET ${name}
+        PROPERTY _EP_${depender}_INDEPENDENT
+      )
       if(dep_independent)
-        message(FATAL_ERROR "ExternalProject '${name}' step '${depender}' is marked INDEPENDENT "
-          "but depends on step '${step}' that is not marked INDEPENDENT.")
+        message(FATAL_ERROR
+          "ExternalProject '${name}' step '${depender}' is marked INDEPENDENT "
+          "but depends on step '${step}' that is not marked INDEPENDENT."
+        )
       endif()
     endif()
   endforeach()
@@ -2303,16 +2345,25 @@ function(ExternalProject_Add_Step name step)
 
   # Dependencies on steps.
   get_property(dependees TARGET ${name} PROPERTY _EP_${step}_DEPENDEES)
-  set_property(TARGET ${name} APPEND PROPERTY _EP_${step}_INTERNAL_DEPENDEES ${dependees})
+  set_property(TARGET ${name} APPEND PROPERTY
+    _EP_${step}_INTERNAL_DEPENDEES ${dependees}
+  )
   foreach(dependee IN LISTS dependees)
-    set_property(TARGET ${name} APPEND PROPERTY _EP_${dependee}_INTERNAL_DEPENDERS ${step})
+    set_property(TARGET ${name} APPEND PROPERTY
+      _EP_${dependee}_INTERNAL_DEPENDERS ${step}
+    )
     _ep_get_step_stampfile(${name} ${dependee} dependee_stamp_file)
     list(APPEND depends ${dependee_stamp_file})
     if(cmp0114 STREQUAL "NEW" AND independent)
-      get_property(dep_independent TARGET ${name} PROPERTY _EP_${dependee}_INDEPENDENT)
+      get_property(dep_independent
+        TARGET ${name}
+        PROPERTY _EP_${dependee}_INDEPENDENT
+      )
       if(NOT dep_independent)
-        message(FATAL_ERROR "ExternalProject '${name}' step '${step}' is marked INDEPENDENT "
-          "but depends on step '${dependee}' that is not marked INDEPENDENT.")
+        message(FATAL_ERROR
+          "ExternalProject '${name}' step '${step}' is marked INDEPENDENT "
+          "but depends on step '${dependee}' that is not marked INDEPENDENT."
+        )
       endif()
     endif()
   endforeach()
@@ -2324,25 +2375,47 @@ function(ExternalProject_Add_Step name step)
   else()
     set(comment "No ${step} step for '${name}'")
   endif()
-  get_property(work_dir TARGET ${name} PROPERTY _EP_${step}_WORKING_DIRECTORY)
+  get_property(work_dir
+    TARGET ${name}
+    PROPERTY _EP_${step}_WORKING_DIRECTORY
+  )
 
   # Replace list separators.
-  get_property(sep TARGET ${name} PROPERTY _EP_LIST_SEPARATOR)
+  get_property(sep
+    TARGET ${name}
+    PROPERTY _EP_LIST_SEPARATOR
+  )
   if(sep AND command)
     string(REPLACE "${sep}" "\\;" command "${command}")
   endif()
 
   # Replace location tags.
-  _ep_replace_location_tags(${name} comment command work_dir byproducts)
+  _ep_replace_location_tags(
+    ${name}
+    comment
+    command
+    work_dir
+    byproducts
+  )
 
   # Custom comment?
-  get_property(comment_set TARGET ${name} PROPERTY _EP_${step}_COMMENT SET)
+  get_property(comment_set
+    TARGET ${name}
+    PROPERTY _EP_${step}_COMMENT
+    SET
+  )
   if(comment_set)
-    get_property(comment TARGET ${name} PROPERTY _EP_${step}_COMMENT)
+    get_property(comment
+      TARGET ${name}
+      PROPERTY _EP_${step}_COMMENT
+    )
   endif()
 
   # Uses terminal?
-  get_property(uses_terminal TARGET ${name} PROPERTY _EP_${step}_USES_TERMINAL)
+  get_property(uses_terminal
+    TARGET ${name}
+    PROPERTY _EP_${step}_USES_TERMINAL
+  )
   if(uses_terminal)
     set(uses_terminal USES_TERMINAL)
   else()
@@ -2350,18 +2423,30 @@ function(ExternalProject_Add_Step name step)
   endif()
 
   # Run every time?
-  get_property(always TARGET ${name} PROPERTY _EP_${step}_ALWAYS)
+  get_property(always
+    TARGET ${name}
+    PROPERTY _EP_${step}_ALWAYS
+  )
   if(always)
-    set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
     set(touch)
+    # Mark stamp files for all configs as SYMBOLIC since we do not create them.
     # Remove any existing stamp in case the option changed in an existing tree.
     get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
     if(_isMultiConfig)
+      _ep_get_configuration_subdir_genex(cfgdir)
       foreach(cfg ${CMAKE_CONFIGURATION_TYPES})
-        string(REPLACE "/${CMAKE_CFG_INTDIR}" "/${cfg}" stamp_file_config "${stamp_file}")
+        string(REPLACE "${cfgdir}" "/${cfg}"
+          stamp_file_config "${stamp_file}"
+        )
+        set_property(SOURCE ${stamp_file_config} PROPERTY SYMBOLIC 1)
         file(REMOVE ${stamp_file_config})
       endforeach()
+      if(CMAKE_GENERATOR STREQUAL "Xcode")
+        # See Xcode case in _ep_get_configuration_subdir_genex.
+        set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
+      endif()
     else()
+      set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
       file(REMOVE ${stamp_file})
     endif()
   else()
@@ -2403,9 +2488,15 @@ function(ExternalProject_Add_Step name step)
   set_property(TARGET ${name} APPEND PROPERTY _EP_STEPS ${step})
 
   # Add custom "step target"?
-  get_property(step_targets TARGET ${name} PROPERTY _EP_STEP_TARGETS)
+  get_property(step_targets
+    TARGET ${name}
+    PROPERTY _EP_STEP_TARGETS
+  )
   if(NOT step_targets)
-    get_property(step_targets DIRECTORY PROPERTY EP_STEP_TARGETS)
+    get_property(step_targets
+      DIRECTORY
+      PROPERTY EP_STEP_TARGETS
+    )
   endif()
   foreach(st ${step_targets})
     if("${st}" STREQUAL "${step}")
@@ -2414,31 +2505,43 @@ function(ExternalProject_Add_Step name step)
     endif()
   endforeach()
 
-  get_property(independent_step_targets TARGET ${name} PROPERTY _EP_INDEPENDENT_STEP_TARGETS)
+  get_property(independent_step_targets
+    TARGET ${name} PROPERTY
+    _EP_INDEPENDENT_STEP_TARGETS
+  )
   if(NOT independent_step_targets)
-    get_property(independent_step_targets DIRECTORY PROPERTY EP_INDEPENDENT_STEP_TARGETS)
+    get_property(independent_step_targets
+      DIRECTORY
+      PROPERTY EP_INDEPENDENT_STEP_TARGETS
+    )
   endif()
   if(cmp0114 STREQUAL "NEW")
     if(independent_step_targets)
       message(FATAL_ERROR
-        "ExternalProject '${name}' option 'INDEPENDENT_STEP_TARGETS' is set to\n"
-        "  ${independent_step_targets}\n"
+        "ExternalProject '${name}' option 'INDEPENDENT_STEP_TARGETS' is set to"
+        "\n  ${independent_step_targets}\n"
         "but the option is no longer allowed.  "
         "It has been superseded by the per-step 'INDEPENDENT' option.  "
         "See policy CMP0114."
-        )
+      )
     endif()
   else()
     if(independent_step_targets AND cmp0114 STREQUAL "")
-      get_property(warned TARGET ${name} PROPERTY _EP_CMP0114_WARNED_INDEPENDENT_STEP_TARGETS)
+      get_property(warned
+        TARGET ${name}
+        PROPERTY _EP_CMP0114_WARNED_INDEPENDENT_STEP_TARGETS
+      )
       if(NOT warned)
-        set_property(TARGET ${name} PROPERTY _EP_CMP0114_WARNED_INDEPENDENT_STEP_TARGETS 1)
+        set_property(TARGET ${name} PROPERTY
+          _EP_CMP0114_WARNED_INDEPENDENT_STEP_TARGETS 1
+        )
         cmake_policy(GET_WARNING CMP0114 _cmp0114_warning)
-        string(APPEND _cmp0114_warning "\n"
-          "ExternalProject '${name}' option INDEPENDENT_STEP_TARGETS is set to\n"
-          "  ${independent_step_targets}\n"
+        string(APPEND _cmp0114_warning
+          "\n"
+          "ExternalProject '${name}' option INDEPENDENT_STEP_TARGETS is set to"
+          "\n  ${independent_step_targets}\n"
           "but the option is deprecated in favor of policy CMP0114."
-          )
+        )
         message(AUTHOR_WARNING "${_cmp0114_warning}")
       endif()
     endif()
@@ -2457,33 +2560,51 @@ function(ExternalProject_Add_StepDependencies name step)
 
   # Sanity checks on "name" and "step".
   if(NOT TARGET ${name})
-    message(FATAL_ERROR "Cannot find target \"${name}\". Perhaps it has not yet been created using ExternalProject_Add.")
+    message(FATAL_ERROR
+      "Cannot find target \"${name}\". Perhaps it has not yet been created "
+      "using ExternalProject_Add."
+    )
   endif()
 
   get_property(type TARGET ${name} PROPERTY TYPE)
   if(NOT type STREQUAL "UTILITY")
-    message(FATAL_ERROR "Target \"${name}\" was not generated by ExternalProject_Add.")
+    message(FATAL_ERROR
+      "Target \"${name}\" was not generated by ExternalProject_Add."
+    )
   endif()
 
   get_property(is_ep TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT)
   if(NOT is_ep)
-    message(FATAL_ERROR "Target \"${name}\" was not generated by ExternalProject_Add.")
+    message(FATAL_ERROR
+      "Target \"${name}\" was not generated by ExternalProject_Add."
+    )
   endif()
 
   get_property(steps TARGET ${name} PROPERTY _EP_STEPS)
   list(FIND steps ${step} is_step)
   if(is_step LESS 0)
-    message(FATAL_ERROR "External project \"${name}\" does not have a step \"${step}\".")
+    message(FATAL_ERROR
+      "External project \"${name}\" does not have a step \"${step}\"."
+    )
   endif()
 
   if(TARGET ${name}-${step})
     get_property(type TARGET ${name}-${step} PROPERTY TYPE)
     if(NOT type STREQUAL "UTILITY")
-      message(FATAL_ERROR "Target \"${name}-${step}\" was not generated by ExternalProject_Add_StepTargets.")
+      message(FATAL_ERROR
+        "Target \"${name}-${step}\" was not generated by "
+        "ExternalProject_Add_StepTargets."
+      )
     endif()
-    get_property(is_ep_step TARGET ${name}-${step} PROPERTY _EP_IS_EXTERNAL_PROJECT_STEP)
+    get_property(is_ep_step
+      TARGET ${name}-${step}
+      PROPERTY _EP_IS_EXTERNAL_PROJECT_STEP
+    )
     if(NOT is_ep_step)
-      message(FATAL_ERROR "Target \"${name}-${step}\" was not generated by ExternalProject_Add_StepTargets.")
+      message(FATAL_ERROR
+        "Target \"${name}-${step}\" was not generated by "
+        "ExternalProject_Add_StepTargets."
+      )
     endif()
   endif()
 
@@ -2493,7 +2614,8 @@ function(ExternalProject_Add_StepDependencies name step)
   foreach(dep ${dependencies})
     add_custom_command(APPEND
       OUTPUT ${stamp_file}
-      DEPENDS ${dep})
+      DEPENDS ${dep}
+    )
     if(TARGET ${name}-${step})
       foreach(dep ${dependencies})
         add_dependencies(${name}-${step} ${dep})
@@ -2505,22 +2627,15 @@ endfunction()
 
 
 function(_ep_add_mkdir_command name)
-  ExternalProject_Get_Property(${name}
-    source_dir binary_dir install_dir stamp_dir download_dir tmp_dir log_dir)
-
-  _ep_get_configuration_subdir_suffix(cfgdir)
+  ExternalProject_Get_Property(${name} tmp_dir)
+  set(script_filename "${tmp_dir}/${name}-mkdirs.cmake")
+  _ep_get_configuration_subdir_genex(cfgdir)
 
   ExternalProject_Add_Step(${name} mkdir
     INDEPENDENT TRUE
     COMMENT "Creating directories for '${name}'"
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${source_dir}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${binary_dir}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${install_dir}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${tmp_dir}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${stamp_dir}${cfgdir}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${download_dir}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${log_dir}
-    )
+    COMMAND ${CMAKE_COMMAND} -Dcfgdir=${cfgdir} -P ${script_filename}
+  )
 endfunction()
 
 
@@ -2534,14 +2649,21 @@ function(_ep_is_dir_empty dir empty_var)
 endfunction()
 
 function(_ep_get_git_submodules_recurse git_submodules_recurse)
-  # Checks for GIT_SUBMODULES_RECURSE property
-  # Default is ON, which sets git_submodules_recurse output variable to "--recursive"
-  # Otherwise, the output variable is set to an empty value ""
-  get_property(git_submodules_recurse_set TARGET ${name} PROPERTY _EP_GIT_SUBMODULES_RECURSE SET)
+  # Checks for GIT_SUBMODULES_RECURSE property. Default is ON, which sets
+  # git_submodules_recurse output variable to "--recursive". Otherwise, the
+  # output variable is set to an empty value "".
+  get_property(git_submodules_recurse_set
+    TARGET ${name}
+    PROPERTY _EP_GIT_SUBMODULES_RECURSE
+    SET
+  )
   if(NOT git_submodules_recurse_set)
     set(recurseFlag "--recursive")
   else()
-    get_property(git_submodules_recurse_value TARGET ${name} PROPERTY _EP_GIT_SUBMODULES_RECURSE)
+    get_property(git_submodules_recurse_value
+      TARGET ${name}
+      PROPERTY _EP_GIT_SUBMODULES_RECURSE
+    )
     if(git_submodules_recurse_value)
       set(recurseFlag "--recursive")
     else()
@@ -2552,13 +2674,21 @@ function(_ep_get_git_submodules_recurse git_submodules_recurse)
 
   # The git submodule update '--recursive' flag requires git >= v1.6.5
   if(recurseFlag AND GIT_VERSION_STRING VERSION_LESS 1.6.5)
-    message(FATAL_ERROR "error: git version 1.6.5 or later required for --recursive flag with 'git submodule ...': GIT_VERSION_STRING='${GIT_VERSION_STRING}'")
+    message(FATAL_ERROR
+      "git version 1.6.5 or later required for --recursive flag with "
+      "'git submodule ...': GIT_VERSION_STRING='${GIT_VERSION_STRING}'"
+    )
   endif()
 endfunction()
 
 
 function(_ep_add_download_command name)
-  ExternalProject_Get_Property(${name} source_dir stamp_dir download_dir tmp_dir)
+  ExternalProject_Get_Property(${name}
+    source_dir
+    stamp_dir
+    download_dir
+    tmp_dir
+  )
 
   get_property(cmd_set TARGET ${name} PROPERTY _EP_DOWNLOAD_COMMAND SET)
   get_property(cmd TARGET ${name} PROPERTY _EP_DOWNLOAD_COMMAND)
@@ -2575,10 +2705,13 @@ function(_ep_add_download_command name)
   set(depends)
   set(comment)
   set(work_dir)
+  set(extra_repo_info)
 
   if(cmd_set)
     set(work_dir ${download_dir})
+    set(method custom)
   elseif(cvs_repository)
+    set(method cvs)
     find_package(CVS QUIET)
     if(NOT CVS_EXECUTABLE)
       message(FATAL_ERROR "error: could not find cvs for checkout of ${name}")
@@ -2590,22 +2723,20 @@ function(_ep_add_download_command name)
     endif()
 
     get_property(cvs_tag TARGET ${name} PROPERTY _EP_CVS_TAG)
-
-    set(repository ${cvs_repository})
-    set(module ${cvs_module})
-    set(tag ${cvs_tag})
-    configure_file(
-      "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
-      "${stamp_dir}/${name}-cvsinfo.txt"
-      @ONLY
-      )
-
     get_filename_component(src_name "${source_dir}" NAME)
     get_filename_component(work_dir "${source_dir}" PATH)
     set(comment "Performing download step (CVS checkout) for '${name}'")
-    set(cmd ${CVS_EXECUTABLE} -d ${cvs_repository} -q co ${cvs_tag} -d ${src_name} ${cvs_module})
-    list(APPEND depends ${stamp_dir}/${name}-cvsinfo.txt)
+    set(cmd
+      ${CVS_EXECUTABLE}
+      -d ${cvs_repository}
+      -q
+      co ${cvs_tag}
+      -d ${src_name}
+      ${cvs_module}
+    )
+
   elseif(svn_repository)
+    set(method svn)
     find_package(Subversion QUIET)
     if(NOT Subversion_SVN_EXECUTABLE)
       message(FATAL_ERROR "error: could not find svn for checkout of ${name}")
@@ -2615,15 +2746,15 @@ function(_ep_add_download_command name)
     get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
     get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD)
     get_property(svn_trust_cert TARGET ${name} PROPERTY _EP_SVN_TRUST_CERT)
-
-    set(repository "${svn_repository} user=${svn_username} password=${svn_password}")
-    set(module)
-    set(tag ${svn_revision})
-    configure_file(
-      "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
-      "${stamp_dir}/${name}-svninfo.txt"
-      @ONLY
-      )
+    get_property(uses_terminal
+      TARGET ${name}
+      PROPERTY _EP_USES_TERMINAL_DOWNLOAD
+    )
+    if(uses_terminal)
+      set(svn_interactive_args "")
+    else()
+      set(svn_interactive_args "--non-interactive")
+    endif()
 
     get_filename_component(src_name "${source_dir}" NAME)
     get_filename_component(work_dir "${source_dir}" PATH)
@@ -2638,10 +2769,19 @@ function(_ep_add_download_command name)
     if(svn_trust_cert)
       set(svn_trust_cert_args --trust-server-cert)
     endif()
-    set(cmd ${Subversion_SVN_EXECUTABLE} co ${svn_repository} ${svn_revision}
-      --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args} ${src_name})
-    list(APPEND depends ${stamp_dir}/${name}-svninfo.txt)
+    set(cmd
+      ${Subversion_SVN_EXECUTABLE}
+      co
+      ${svn_repository}
+      ${svn_revision}
+      ${svn_interactive_args}
+      ${svn_trust_cert_args}
+      ${svn_user_pw_args}
+      ${src_name}
+    )
+
   elseif(git_repository)
+    set(method git)
     # FetchContent gives us these directly, so don't try to recompute them
     if(NOT GIT_EXECUTABLE OR NOT GIT_VERSION_STRING)
       unset(CMAKE_MODULE_PATH) # Use CMake builtin find module
@@ -2659,7 +2799,10 @@ function(_ep_add_download_command name)
     endif()
 
     set(git_init_submodules TRUE)
-    get_property(git_submodules_set TARGET ${name} PROPERTY _EP_GIT_SUBMODULES SET)
+    get_property(git_submodules_set
+      TARGET ${name}
+      PROPERTY _EP_GIT_SUBMODULES SET
+    )
     if(git_submodules_set)
       get_property(git_submodules TARGET ${name} PROPERTY _EP_GIT_SUBMODULES)
       if(git_submodules  STREQUAL "" AND _EP_CMP0097 STREQUAL "NEW")
@@ -2686,21 +2829,21 @@ function(_ep_add_download_command name)
       list(PREPEND git_config advice.detachedHead=false)
     endif()
 
-    # For the download step, and the git clone operation, only the repository
-    # should be recorded in a configured RepositoryInfo file. If the repo
-    # changes, the clone script should be run again. But if only the tag
-    # changes, avoid running the clone script again. Let the 'always' running
-    # update step checkout the new tag.
+    # The command doesn't expose any details, so we need to record additional
+    # information in the RepositoryInfo.txt file. For the download step, only
+    # the things specifically affecting the clone operation should be recorded.
+    # If the repo changes, the clone script should be run again.
+    # But if only the tag changes, avoid running the clone script again.
+    # Let the 'always' running update step checkout the new tag.
     #
-    set(repository ${git_repository})
-    set(module)
-    set(tag ${git_remote_name})
-    configure_file(
-      "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
-      "${stamp_dir}/${name}-gitinfo.txt"
-      @ONLY
-      )
-
+    set(extra_repo_info
+"repository=${git_repository}
+remote=${git_remote_name}
+init_submodules=${git_init_submodules}
+recurse_submodules=${git_submodules_recurse}
+submodules=${git_submodules}
+CMP0097=${_EP_CMP0097}
+")
     get_filename_component(src_name "${source_dir}" NAME)
     get_filename_component(work_dir "${source_dir}" PATH)
 
@@ -2708,14 +2851,30 @@ function(_ep_add_download_command name)
     # create a cmake script to invoke as download command.
     # The script will delete the source directory and then call git clone.
     #
-    _ep_write_gitclone_script(${tmp_dir}/${name}-gitclone.cmake ${source_dir}
-      ${GIT_EXECUTABLE} ${git_repository} ${git_tag} ${git_remote_name} ${git_init_submodules} "${git_submodules_recurse}" "${git_submodules}" "${git_shallow}" "${git_progress}" "${git_config}" ${src_name} ${work_dir}
-      ${stamp_dir}/${name}-gitinfo.txt ${stamp_dir}/${name}-gitclone-lastrun.txt "${tls_verify}"
-      )
+    _ep_write_gitclone_script(
+      ${tmp_dir}/${name}-gitclone.cmake
+      ${source_dir}
+      ${GIT_EXECUTABLE}
+      ${git_repository}
+      ${git_tag}
+      ${git_remote_name}
+      ${git_init_submodules}
+      "${git_submodules_recurse}"
+      "${git_submodules}"
+      "${git_shallow}"
+      "${git_progress}"
+      "${git_config}"
+      ${src_name}
+      ${work_dir}
+      ${stamp_dir}/${name}-gitinfo.txt
+      ${stamp_dir}/${name}-gitclone-lastrun.txt
+      "${tls_verify}"
+    )
     set(comment "Performing download step (git clone) for '${name}'")
     set(cmd ${CMAKE_COMMAND} -P ${tmp_dir}/${name}-gitclone.cmake)
-    list(APPEND depends ${stamp_dir}/${name}-gitinfo.txt)
+
   elseif(hg_repository)
+    set(method hg)
     find_package(Hg QUIET)
     if(NOT HG_EXECUTABLE)
       message(FATAL_ERROR "error: could not find hg for clone of ${name}")
@@ -2726,21 +2885,14 @@ function(_ep_add_download_command name)
       set(hg_tag "tip")
     endif()
 
-    # For the download step, and the hg clone operation, only the repository
-    # should be recorded in a configured RepositoryInfo file. If the repo
-    # changes, the clone script should be run again. But if only the tag
-    # changes, avoid running the clone script again. Let the 'always' running
-    # update step checkout the new tag.
+    # The command doesn't expose any details, so we need to record additional
+    # information in the RepositoryInfo.txt file. For the download step, only
+    # the things specifically affecting the clone operation should be recorded.
+    # If the repo changes, the clone script should be run again.
+    # But if only the tag changes, avoid running the clone script again.
+    # Let the 'always' running update step checkout the new tag.
     #
-    set(repository ${hg_repository})
-    set(module)
-    set(tag)
-    configure_file(
-      "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
-      "${stamp_dir}/${name}-hginfo.txt"
-      @ONLY
-      )
-
+    set(extra_repo_info "repository=${hg_repository}")
     get_filename_component(src_name "${source_dir}" NAME)
     get_filename_component(work_dir "${source_dir}" PATH)
 
@@ -2748,46 +2900,59 @@ function(_ep_add_download_command name)
     # create a cmake script to invoke as download command.
     # The script will delete the source directory and then call hg clone.
     #
-    _ep_write_hgclone_script(${tmp_dir}/${name}-hgclone.cmake ${source_dir}
-      ${HG_EXECUTABLE} ${hg_repository} ${hg_tag} ${src_name} ${work_dir}
-      ${stamp_dir}/${name}-hginfo.txt ${stamp_dir}/${name}-hgclone-lastrun.txt
-      )
+    _ep_write_hgclone_script(
+      ${tmp_dir}/${name}-hgclone.cmake
+      ${source_dir}
+      ${HG_EXECUTABLE}
+      ${hg_repository}
+      ${hg_tag}
+      ${src_name}
+      ${work_dir}
+      ${stamp_dir}/${name}-hginfo.txt
+      ${stamp_dir}/${name}-hgclone-lastrun.txt
+    )
     set(comment "Performing download step (hg clone) for '${name}'")
     set(cmd ${CMAKE_COMMAND} -P ${tmp_dir}/${name}-hgclone.cmake)
-    list(APPEND depends ${stamp_dir}/${name}-hginfo.txt)
+
   elseif(url)
+    set(method url)
     get_filename_component(work_dir "${source_dir}" PATH)
     get_property(hash TARGET ${name} PROPERTY _EP_URL_HASH)
     _ep_get_hash_regex(_ep_hash_regex)
     if(hash AND NOT "${hash}" MATCHES "${_ep_hash_regex}")
       _ep_get_hash_algos(_ep_hash_algos)
       list(JOIN _ep_hash_algos "|" _ep_hash_algos)
-      message(FATAL_ERROR "URL_HASH is set to\n  ${hash}\n"
-        "but must be ALGO=value where ALGO is\n  ${_ep_hash_algos}\n"
-        "and value is a hex string.")
+      message(FATAL_ERROR
+        "URL_HASH is set to\n"
+        "  ${hash}\n"
+        "but must be ALGO=value where ALGO is\n"
+        "  ${_ep_hash_algos}\n"
+        "and value is a hex string."
+      )
     endif()
     get_property(md5 TARGET ${name} PROPERTY _EP_URL_MD5)
     if(md5 AND NOT "MD5=${md5}" MATCHES "${_ep_hash_regex}")
-      message(FATAL_ERROR "URL_MD5 is set to\n  ${md5}\nbut must be a hex string.")
+      message(FATAL_ERROR
+        "URL_MD5 is set to\n"
+        "  ${md5}\n"
+        "but must be a hex string."
+      )
     endif()
     if(md5 AND NOT hash)
       set(hash "MD5=${md5}")
     endif()
-    set(repository "external project URL")
-    set(module "${url}")
-    set(tag "${hash}")
-    configure_file(
-      "${CMAKE_ROOT}/Modules/RepositoryInfo.txt.in"
-      "${stamp_dir}/${name}-urlinfo.txt"
-      @ONLY
-      )
-    list(APPEND depends ${stamp_dir}/${name}-urlinfo.txt)
+    set(extra_repo_info
+"url(s)=${url}
+hash=${hash}
+")
 
     list(LENGTH url url_list_length)
     if(NOT "${url_list_length}" STREQUAL "1")
       foreach(entry ${url})
         if(NOT "${entry}" MATCHES "^[a-z]+://")
-          message(FATAL_ERROR "At least one entry of URL is a path (invalid in a list)")
+          message(FATAL_ERROR
+            "At least one entry of URL is a path (invalid in a list)"
+          )
         endif()
       endforeach()
       if("x${fname}" STREQUAL "x")
@@ -2798,16 +2963,23 @@ function(_ep_add_download_command name)
     if(IS_DIRECTORY "${url}")
       get_filename_component(abs_dir "${url}" ABSOLUTE)
       set(comment "Performing download step (DIR copy) for '${name}'")
-      set(cmd   ${CMAKE_COMMAND} -E rm -rf ${source_dir}
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir})
+      set(cmd
+        ${CMAKE_COMMAND} -E rm -rf ${source_dir}
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${abs_dir} ${source_dir}
+      )
     else()
-      get_property(no_extract TARGET "${name}" PROPERTY _EP_DOWNLOAD_NO_EXTRACT)
+      get_property(no_extract
+        TARGET "${name}"
+        PROPERTY _EP_DOWNLOAD_NO_EXTRACT
+      )
+      string(APPEND extra_repo_info "no_extract=${no_extract}\n")
       if("${url}" MATCHES "^[a-z]+://")
         # TODO: Should download and extraction be different steps?
         if("x${fname}" STREQUAL "x")
           set(fname "${url}")
         endif()
-        if("${fname}" MATCHES [[([^/\?#]+(\.|=)(7z|tar|tar\.bz2|tar\.gz|tar\.xz|tbz2|tgz|txz|zip))([/?#].*)?$]])
+        set(ext_regex [[7z|tar|tar\.bz2|tar\.gz|tar\.xz|tbz2|tgz|txz|zip]])
+        if("${fname}" MATCHES "([^/\\?#]+(\\.|=)(${ext_regex}))([/?#].*)?$")
           set(fname "${CMAKE_MATCH_1}")
         elseif(no_extract)
           get_filename_component(fname "${fname}" NAME)
@@ -2822,8 +2994,14 @@ function(_ep_add_download_command name)
         string(REPLACE ";" "-" fname "${fname}")
         set(file ${download_dir}/${fname})
         get_property(timeout TARGET ${name} PROPERTY _EP_TIMEOUT)
-        get_property(inactivity_timeout TARGET ${name} PROPERTY _EP_INACTIVITY_TIMEOUT)
-        get_property(no_progress TARGET ${name} PROPERTY _EP_DOWNLOAD_NO_PROGRESS)
+        get_property(inactivity_timeout
+          TARGET ${name}
+          PROPERTY _EP_INACTIVITY_TIMEOUT
+        )
+        get_property(no_progress
+          TARGET ${name}
+          PROPERTY _EP_DOWNLOAD_NO_PROGRESS
+        )
         get_property(tls_verify TARGET ${name} PROPERTY _EP_TLS_VERIFY)
         get_property(tls_cainfo TARGET ${name} PROPERTY _EP_TLS_CAINFO)
         get_property(netrc TARGET ${name} PROPERTY _EP_NETRC)
@@ -2832,16 +3010,38 @@ function(_ep_add_download_command name)
         get_property(http_password TARGET ${name} PROPERTY _EP_HTTP_PASSWORD)
         get_property(http_headers TARGET ${name} PROPERTY _EP_HTTP_HEADER)
         set(download_script "${stamp_dir}/download-${name}.cmake")
-        _ep_write_downloadfile_script("${download_script}" "${url}" "${file}" "${timeout}" "${inactivity_timeout}" "${no_progress}" "${hash}" "${tls_verify}" "${tls_cainfo}" "${http_username}:${http_password}" "${http_headers}" "${netrc}" "${netrc_file}")
-        set(cmd ${CMAKE_COMMAND} -P "${download_script}"
-          COMMAND)
+        _ep_write_downloadfile_script(
+          "${download_script}"
+          "${url}"
+          "${file}"
+          "${timeout}"
+          "${inactivity_timeout}"
+          "${no_progress}"
+          "${hash}"
+          "${tls_verify}"
+          "${tls_cainfo}"
+          "${http_username}:${http_password}"
+          "${http_headers}"
+          "${netrc}"
+          "${netrc_file}"
+        )
+        set(cmd
+          ${CMAKE_COMMAND} -P "${download_script}"
+          COMMAND
+        )
         if (no_extract)
           set(steps "download and verify")
         else ()
           set(steps "download, verify and extract")
         endif ()
         set(comment "Performing download step (${steps}) for '${name}'")
-        file(WRITE "${stamp_dir}/verify-${name}.cmake" "") # already verified by 'download_script'
+        # already verified by 'download_script'
+        file(WRITE "${stamp_dir}/verify-${name}.cmake" "")
+
+        # Rather than adding everything to the RepositoryInfo.txt file, it is
+        # more robust to just depend on the download script. That way, we will
+        # re-download if any aspect of the download changes.
+        list(APPEND depends "${download_script}")
       else()
         set(file "${url}")
         if (no_extract)
@@ -2850,20 +3050,69 @@ function(_ep_add_download_command name)
           set(steps "verify and extract")
         endif ()
         set(comment "Performing download step (${steps}) for '${name}'")
-        _ep_write_verifyfile_script("${stamp_dir}/verify-${name}.cmake" "${file}" "${hash}")
+        _ep_write_verifyfile_script(
+          "${stamp_dir}/verify-${name}.cmake"
+          "${file}"
+          "${hash}"
+        )
       endif()
       list(APPEND cmd ${CMAKE_COMMAND} -P ${stamp_dir}/verify-${name}.cmake)
-      if (NOT no_extract)
-        _ep_write_extractfile_script("${stamp_dir}/extract-${name}.cmake" "${name}" "${file}" "${source_dir}")
-        list(APPEND cmd COMMAND ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake)
-      else ()
+      get_target_property(extract_timestamp ${name}
+        _EP_DOWNLOAD_EXTRACT_TIMESTAMP
+      )
+      if(no_extract)
+        if(NOT extract_timestamp STREQUAL "extract_timestamp-NOTFOUND")
+          message(FATAL_ERROR
+            "Cannot specify DOWNLOAD_EXTRACT_TIMESTAMP when using "
+            "DOWNLOAD_NO_EXTRACT TRUE"
+          )
+        endif()
         set_property(TARGET ${name} PROPERTY _EP_DOWNLOADED_FILE ${file})
+      else()
+        if(extract_timestamp STREQUAL "extract_timestamp-NOTFOUND")
+          # Default depends on policy CMP0135
+          if(_EP_CMP0135 STREQUAL "")
+            message(AUTHOR_WARNING
+              "The DOWNLOAD_EXTRACT_TIMESTAMP option was not given and policy "
+              "CMP0135 is not set. The policy's OLD behavior will be used. "
+              "When using a URL download, the timestamps of extracted files "
+              "should preferably be that of the time of extraction, otherwise "
+              "code that depends on the extracted contents might not be "
+              "rebuilt if the URL changes. The OLD behavior preserves the "
+              "timestamps from the archive instead, but this is usually not "
+              "what you want. Update your project to the NEW behavior or "
+              "specify the DOWNLOAD_EXTRACT_TIMESTAMP option with a value of "
+              "true to avoid this robustness issue."
+            )
+            set(extract_timestamp TRUE)
+          elseif(_EP_CMP0135 STREQUAL "NEW")
+            set(extract_timestamp FALSE)
+          else()
+            set(extract_timestamp TRUE)
+          endif()
+        endif()
+        if(extract_timestamp)
+          set(options "")
+        else()
+          set(options "--touch")
+        endif()
+        _ep_write_extractfile_script(
+          "${stamp_dir}/extract-${name}.cmake"
+          "${name}"
+          "${file}"
+          "${source_dir}"
+          "${options}"
+        )
+        list(APPEND cmd
+          COMMAND ${CMAKE_COMMAND} -P ${stamp_dir}/extract-${name}.cmake
+        )
       endif ()
     endif()
   else()
+    set(method source_dir)
     _ep_is_dir_empty("${source_dir}" empty)
     if(${empty})
-      message(SEND_ERROR
+      message(FATAL_ERROR
         "No download info given for '${name}' and its source directory:\n"
         " ${source_dir}\n"
         "is not an existing non-empty directory.  Please specify one of:\n"
@@ -2874,19 +3123,35 @@ function(_ep_add_download_command name)
         " * SVN_REPOSITORY\n"
         " * HG_REPOSITORY\n"
         " * CVS_REPOSITORY and CVS_MODULE"
-        )
+      )
     endif()
   endif()
 
-  get_property(log TARGET ${name} PROPERTY _EP_LOG_DOWNLOAD)
+  # We use configure_file() to write the repo_info_file so that the file's
+  # timestamp is not updated if we don't change the contents
+
+  set(repo_info_file ${stamp_dir}/${name}-${method}info.txt)
+  list(APPEND depends ${repo_info_file})
+  configure_file(
+    "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/RepositoryInfo.txt.in"
+    "${repo_info_file}"
+    @ONLY
+  )
+
+  get_property(log
+    TARGET ${name}
+    PROPERTY _EP_LOG_DOWNLOAD
+  )
   if(log)
     set(log LOG 1)
   else()
     set(log "")
   endif()
 
-  get_property(uses_terminal TARGET ${name} PROPERTY
-    _EP_USES_TERMINAL_DOWNLOAD)
+  get_property(uses_terminal
+    TARGET ${name}
+    PROPERTY _EP_USES_TERMINAL_DOWNLOAD
+  )
   if(uses_terminal)
     set(uses_terminal USES_TERMINAL 1)
   else()
@@ -2907,16 +3172,26 @@ function(_ep_add_download_command name)
       DEPENDEES mkdir
       ${log}
       ${uses_terminal}
-      )"
+    )"
   )
 endfunction()
 
 function(_ep_get_update_disconnected var name)
-  get_property(update_disconnected_set TARGET ${name} PROPERTY _EP_UPDATE_DISCONNECTED SET)
+  get_property(update_disconnected_set
+    TARGET ${name}
+    PROPERTY _EP_UPDATE_DISCONNECTED
+    SET
+  )
   if(update_disconnected_set)
-    get_property(update_disconnected TARGET ${name} PROPERTY _EP_UPDATE_DISCONNECTED)
+    get_property(update_disconnected
+      TARGET ${name}
+      PROPERTY _EP_UPDATE_DISCONNECTED
+    )
   else()
-    get_property(update_disconnected DIRECTORY PROPERTY EP_UPDATE_DISCONNECTED)
+    get_property(update_disconnected
+      DIRECTORY
+      PROPERTY EP_UPDATE_DISCONNECTED
+    )
   endif()
   set(${var} "${update_disconnected}" PARENT_SCOPE)
 endfunction()
@@ -2961,6 +3236,12 @@ function(_ep_add_update_command name)
     get_property(svn_username TARGET ${name} PROPERTY _EP_SVN_USERNAME)
     get_property(svn_password TARGET ${name} PROPERTY _EP_SVN_PASSWORD)
     get_property(svn_trust_cert TARGET ${name} PROPERTY _EP_SVN_TRUST_CERT)
+    get_property(uses_terminal TARGET ${name} PROPERTY _EP_USES_TERMINAL_UPDATE)
+    if(uses_terminal)
+      set(svn_interactive_args "")
+    else()
+      set(svn_interactive_args "--non-interactive")
+    endif()
     set(svn_user_pw_args "")
     if(DEFINED svn_username)
       set(svn_user_pw_args ${svn_user_pw_args} "--username=${svn_username}")
@@ -2971,8 +3252,14 @@ function(_ep_add_update_command name)
     if(svn_trust_cert)
       set(svn_trust_cert_args --trust-server-cert)
     endif()
-    set(cmd ${Subversion_SVN_EXECUTABLE} up ${svn_revision}
-      --non-interactive ${svn_trust_cert_args} ${svn_user_pw_args})
+    set(cmd
+      ${Subversion_SVN_EXECUTABLE}
+      up
+      ${svn_revision}
+      ${svn_interactive_args}
+      ${svn_trust_cert_args}
+      ${svn_user_pw_args}
+    )
     set(always 1)
   elseif(git_repository)
     # FetchContent gives us these directly, so don't try to recompute them
@@ -2985,25 +3272,43 @@ function(_ep_add_update_command name)
     endif()
     set(work_dir ${source_dir})
     set(comment "Performing update step for '${name}'")
-    get_property(git_tag TARGET ${name} PROPERTY _EP_GIT_TAG)
+
+    get_property(git_tag
+      TARGET ${name}
+      PROPERTY _EP_GIT_TAG
+    )
     if(NOT git_tag)
       set(git_tag "master")
     endif()
-    get_property(git_remote_name TARGET ${name} PROPERTY _EP_GIT_REMOTE_NAME)
+
+    get_property(git_remote_name
+      TARGET ${name}
+      PROPERTY _EP_GIT_REMOTE_NAME
+    )
     if(NOT git_remote_name)
       set(git_remote_name "origin")
     endif()
 
     set(git_init_submodules TRUE)
-    get_property(git_submodules_set TARGET ${name} PROPERTY _EP_GIT_SUBMODULES SET)
+    get_property(git_submodules_set
+      TARGET ${name}
+      PROPERTY _EP_GIT_SUBMODULES
+      SET
+    )
     if(git_submodules_set)
-      get_property(git_submodules TARGET ${name} PROPERTY _EP_GIT_SUBMODULES)
+      get_property(git_submodules
+        TARGET ${name}
+        PROPERTY _EP_GIT_SUBMODULES
+      )
       if(git_submodules  STREQUAL "" AND _EP_CMP0097 STREQUAL "NEW")
         set(git_init_submodules FALSE)
       endif()
     endif()
 
-    get_property(git_update_strategy TARGET ${name} PROPERTY _EP_GIT_REMOTE_UPDATE_STRATEGY)
+    get_property(git_update_strategy
+      TARGET ${name}
+      PROPERTY _EP_GIT_REMOTE_UPDATE_STRATEGY
+    )
     if(NOT git_update_strategy)
       set(git_update_strategy "${CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY}")
     endif()
@@ -3012,14 +3317,26 @@ function(_ep_add_update_command name)
     endif()
     set(strategies CHECKOUT REBASE REBASE_CHECKOUT)
     if(NOT git_update_strategy IN_LIST strategies)
-      message(FATAL_ERROR "'${git_update_strategy}' is not one of the supported strategies: ${strategies}")
+      message(FATAL_ERROR
+        "'${git_update_strategy}' is not one of the supported strategies: "
+        "${strategies}"
+      )
     endif()
 
     _ep_get_git_submodules_recurse(git_submodules_recurse)
 
-    _ep_write_gitupdate_script(${tmp_dir}/${name}-gitupdate.cmake
-      ${GIT_EXECUTABLE} ${git_tag} ${git_remote_name} ${git_init_submodules} "${git_submodules_recurse}" "${git_submodules}" ${git_repository} ${work_dir} ${git_update_strategy}
-      )
+    _ep_write_gitupdate_script(
+      "${tmp_dir}/${name}-gitupdate.cmake"
+      "${GIT_EXECUTABLE}"
+      "${git_tag}"
+      "${git_remote_name}"
+      "${git_init_submodules}"
+      "${git_submodules_recurse}"
+      "${git_submodules}"
+      "${git_repository}"
+      "${work_dir}"
+      "${git_update_strategy}"
+    )
     set(cmd ${CMAKE_COMMAND} -P ${tmp_dir}/${name}-gitupdate.cmake)
     set(always 1)
   elseif(hg_repository)
@@ -3028,32 +3345,48 @@ function(_ep_add_update_command name)
     endif()
     set(work_dir ${source_dir})
     set(comment "Performing update step (hg pull) for '${name}'")
-    get_property(hg_tag TARGET ${name} PROPERTY _EP_HG_TAG)
+
+    get_property(hg_tag
+      TARGET ${name}
+      PROPERTY _EP_HG_TAG
+    )
     if(NOT hg_tag)
       set(hg_tag "tip")
     endif()
+
     if("${HG_VERSION_STRING}" STREQUAL "2.1")
-      message(WARNING "Mercurial 2.1 does not distinguish an empty pull from a failed pull:
- http://mercurial.selenic.com/wiki/UpgradeNotes#A2.1.1:_revert_pull_return_code_change.2C_compile_issue_on_OS_X
+      set(notesAnchor
+        "#A2.1.1:_revert_pull_return_code_change.2C_compile_issue_on_OS_X"
+      )
+      message(WARNING
+"Mercurial 2.1 does not distinguish an empty pull from a failed pull:
+ http://mercurial.selenic.com/wiki/UpgradeNotes${notesAnchor}
  http://thread.gmane.org/gmane.comp.version-control.mercurial.devel/47656
 Update to Mercurial >= 2.1.1.
 ")
     endif()
-    set(cmd ${HG_EXECUTABLE} pull
+
+    set(cmd
+      ${HG_EXECUTABLE} pull
       COMMAND ${HG_EXECUTABLE} update ${hg_tag}
-      )
+    )
     set(always 1)
   endif()
 
-  get_property(log TARGET ${name} PROPERTY _EP_LOG_UPDATE)
+  get_property(log
+    TARGET ${name}
+    PROPERTY _EP_LOG_UPDATE
+  )
   if(log)
     set(log LOG 1)
   else()
     set(log "")
   endif()
 
-  get_property(uses_terminal TARGET ${name} PROPERTY
-    _EP_USES_TERMINAL_UPDATE)
+  get_property(uses_terminal
+    TARGET ${name}
+    PROPERTY _EP_USES_TERMINAL_UPDATE
+  )
   if(uses_terminal)
     set(uses_terminal USES_TERMINAL 1)
   else()
@@ -3075,7 +3408,7 @@ Update to Mercurial >= 2.1.1.
       DEPENDEES download
       ${log}
       ${uses_terminal}
-      )"
+    )"
   )
 
 endfunction()
@@ -3093,13 +3426,26 @@ function(_ep_add_patch_command name)
     set(work_dir ${source_dir})
   endif()
 
-  get_property(log TARGET ${name} PROPERTY _EP_LOG_PATCH)
+  get_property(log
+    TARGET ${name}
+    PROPERTY _EP_LOG_PATCH
+  )
   if(log)
     set(log LOG 1)
   else()
     set(log "")
   endif()
 
+  get_property(uses_terminal
+    TARGET ${name}
+    PROPERTY _EP_USES_TERMINAL_PATCH
+  )
+  if(uses_terminal)
+    set(uses_terminal USES_TERMINAL 1)
+  else()
+    set(uses_terminal "")
+  endif()
+
   _ep_get_update_disconnected(update_disconnected ${name})
   if(update_disconnected)
     set(patch_dep download)
@@ -3118,18 +3464,28 @@ function(_ep_add_patch_command name)
       WORKING_DIRECTORY \${work_dir}
       DEPENDEES \${patch_dep}
       ${log}
-      )"
+      ${uses_terminal}
+    )"
   )
 endfunction()
 
 function(_ep_get_file_deps var name)
   set(file_deps)
 
-  get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
+  get_property(deps
+    TARGET ${name}
+    PROPERTY _EP_DEPENDS
+  )
   foreach(dep IN LISTS deps)
-    get_property(dep_type TARGET ${dep} PROPERTY TYPE)
+    get_property(dep_type
+      TARGET ${dep}
+      PROPERTY TYPE
+    )
     if(dep_type STREQUAL "UTILITY")
-      get_property(is_ep TARGET ${dep} PROPERTY _EP_IS_EXTERNAL_PROJECT)
+      get_property(is_ep
+        TARGET ${dep}
+        PROPERTY _EP_IS_EXTERNAL_PROJECT
+      )
       if(is_ep)
         _ep_get_step_stampfile(${dep} "done" done_stamp_file)
         list(APPEND file_deps ${done_stamp_file})
@@ -3141,9 +3497,16 @@ function(_ep_get_file_deps var name)
 endfunction()
 
 function(_ep_extract_configure_command var name)
-  get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET)
+  get_property(cmd_set
+    TARGET ${name}
+    PROPERTY _EP_CONFIGURE_COMMAND
+    SET
+  )
   if(cmd_set)
-    get_property(cmd TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND)
+    get_property(cmd
+      TARGET ${name}
+      PROPERTY _EP_CONFIGURE_COMMAND
+    )
   else()
     get_target_property(cmake_command ${name} _EP_CMAKE_COMMAND)
     if(cmake_command)
@@ -3152,13 +3515,22 @@ function(_ep_extract_configure_command var name)
       set(cmd "${CMAKE_COMMAND}")
     endif()
 
-    get_property(cmake_args TARGET ${name} PROPERTY _EP_CMAKE_ARGS)
+    get_property(cmake_args
+      TARGET ${name}
+      PROPERTY _EP_CMAKE_ARGS
+    )
     list(APPEND cmd ${cmake_args})
 
     # If there are any CMAKE_CACHE_ARGS or CMAKE_CACHE_DEFAULT_ARGS,
     # write an initial cache and use it
-    get_property(cmake_cache_args TARGET ${name} PROPERTY _EP_CMAKE_CACHE_ARGS)
-    get_property(cmake_cache_default_args TARGET ${name} PROPERTY _EP_CMAKE_CACHE_DEFAULT_ARGS)
+    get_property(cmake_cache_args
+      TARGET ${name}
+      PROPERTY _EP_CMAKE_CACHE_ARGS
+    )
+    get_property(cmake_cache_default_args
+      TARGET ${name}
+      PROPERTY _EP_CMAKE_CACHE_DEFAULT_ARGS
+    )
 
     set(has_cmake_cache_args 0)
     if(NOT "${cmake_cache_args}" STREQUAL "")
@@ -3170,10 +3542,18 @@ function(_ep_extract_configure_command var name)
       set(has_cmake_cache_default_args 1)
     endif()
 
-    get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
-    get_target_property(cmake_generator_instance ${name} _EP_CMAKE_GENERATOR_INSTANCE)
-    get_target_property(cmake_generator_platform ${name} _EP_CMAKE_GENERATOR_PLATFORM)
-    get_target_property(cmake_generator_toolset ${name} _EP_CMAKE_GENERATOR_TOOLSET)
+    get_target_property(cmake_generator ${name}
+      _EP_CMAKE_GENERATOR
+    )
+    get_target_property(cmake_generator_instance ${name}
+      _EP_CMAKE_GENERATOR_INSTANCE
+    )
+    get_target_property(cmake_generator_platform ${name}
+      _EP_CMAKE_GENERATOR_PLATFORM
+    )
+    get_target_property(cmake_generator_toolset ${name}
+      _EP_CMAKE_GENERATOR_TOOLSET
+    )
     if(cmake_generator)
       list(APPEND cmd "-G${cmake_generator}")
       if(cmake_generator_platform)
@@ -3183,7 +3563,9 @@ function(_ep_extract_configure_command var name)
         list(APPEND cmd "-T${cmake_generator_toolset}")
       endif()
       if(cmake_generator_instance)
-        list(APPEND cmd "-DCMAKE_GENERATOR_INSTANCE:INTERNAL=${cmake_generator_instance}")
+        list(APPEND cmd
+          "-DCMAKE_GENERATOR_INSTANCE:INTERNAL=${cmake_generator_instance}"
+        )
       endif()
     else()
       if(CMAKE_EXTRA_GENERATOR)
@@ -3192,49 +3574,72 @@ function(_ep_extract_configure_command var name)
         list(APPEND cmd "-G${CMAKE_GENERATOR}")
         if("${CMAKE_GENERATOR}" MATCHES "Green Hills MULTI")
           set(has_cmake_cache_default_args 1)
-          set(cmake_cache_default_args ${cmake_cache_default_args}
+          list(APPEND cmake_cache_default_args
             "-DGHS_TARGET_PLATFORM:STRING=${GHS_TARGET_PLATFORM}"
             "-DGHS_PRIMARY_TARGET:STRING=${GHS_PRIMARY_TARGET}"
             "-DGHS_TOOLSET_ROOT:STRING=${GHS_TOOLSET_ROOT}"
             "-DGHS_OS_ROOT:STRING=${GHS_OS_ROOT}"
             "-DGHS_OS_DIR:STRING=${GHS_OS_DIR}"
-            "-DGHS_BSP_NAME:STRING=${GHS_BSP_NAME}")
+            "-DGHS_BSP_NAME:STRING=${GHS_BSP_NAME}"
+          )
         endif()
       endif()
       if(cmake_generator_platform)
-        message(FATAL_ERROR "Option CMAKE_GENERATOR_PLATFORM not allowed without CMAKE_GENERATOR.")
+        message(FATAL_ERROR
+          "Option CMAKE_GENERATOR_PLATFORM not allowed without "
+          "CMAKE_GENERATOR."
+        )
       endif()
       if(CMAKE_GENERATOR_PLATFORM)
         list(APPEND cmd "-A${CMAKE_GENERATOR_PLATFORM}")
       endif()
       if(cmake_generator_toolset)
-        message(FATAL_ERROR "Option CMAKE_GENERATOR_TOOLSET not allowed without CMAKE_GENERATOR.")
+        message(FATAL_ERROR
+          "Option CMAKE_GENERATOR_TOOLSET not allowed without CMAKE_GENERATOR."
+        )
       endif()
       if(CMAKE_GENERATOR_TOOLSET)
         list(APPEND cmd "-T${CMAKE_GENERATOR_TOOLSET}")
       endif()
       if(cmake_generator_instance)
-        message(FATAL_ERROR "Option CMAKE_GENERATOR_INSTANCE not allowed without CMAKE_GENERATOR.")
+        message(FATAL_ERROR
+          "Option CMAKE_GENERATOR_INSTANCE not allowed without CMAKE_GENERATOR."
+        )
       endif()
       if(CMAKE_GENERATOR_INSTANCE)
-        list(APPEND cmd "-DCMAKE_GENERATOR_INSTANCE:INTERNAL=${CMAKE_GENERATOR_INSTANCE}")
+        list(APPEND cmd
+          "-DCMAKE_GENERATOR_INSTANCE:INTERNAL=${CMAKE_GENERATOR_INSTANCE}"
+        )
       endif()
     endif()
 
     if(has_cmake_cache_args OR has_cmake_cache_default_args)
       set(_ep_cache_args_script "<TMP_DIR>/${name}-cache-$<CONFIG>.cmake")
       if(has_cmake_cache_args)
-        _ep_command_line_to_initial_cache(script_initial_cache_force "${cmake_cache_args}" 1)
+        _ep_command_line_to_initial_cache(
+          script_initial_cache_force
+          "${cmake_cache_args}"
+          1
+        )
       endif()
       if(has_cmake_cache_default_args)
-        _ep_command_line_to_initial_cache(script_initial_cache_default "${cmake_cache_default_args}" 0)
+        _ep_command_line_to_initial_cache(
+          script_initial_cache_default
+          "${cmake_cache_default_args}"
+          0
+        )
       endif()
-      _ep_write_initial_cache(${name} "${_ep_cache_args_script}" "${script_initial_cache_force}${script_initial_cache_default}")
+      _ep_write_initial_cache(
+        ${name}
+        "${_ep_cache_args_script}"
+        "${script_initial_cache_force}${script_initial_cache_default}"
+      )
       list(APPEND cmd "-C${_ep_cache_args_script}")
       _ep_replace_location_tags(${name} _ep_cache_args_script)
       set(_ep_cache_args_script
         "${_ep_cache_args_script}"
-        PARENT_SCOPE)
+        PARENT_SCOPE
+      )
     endif()
 
     list(APPEND cmd "<SOURCE_DIR><SOURCE_SUBDIR>")
@@ -3248,8 +3653,10 @@ function(_ep_add_configure_command name)
   ExternalProject_Get_Property(${name} binary_dir tmp_dir)
 
   set(file_deps)
-  get_property(configure_handled_by_build TARGET ${name}
-               PROPERTY _EP_CONFIGURE_HANDLED_BY_BUILD)
+  get_property(configure_handled_by_build
+    TARGET ${name}
+    PROPERTY _EP_CONFIGURE_HANDLED_BY_BUILD
+  )
   if(NOT configure_handled_by_build)
     # Depend on other external projects (file-level)
     _ep_get_file_deps(file_deps ${name})
@@ -3261,22 +3668,28 @@ function(_ep_add_configure_command name)
   # used, cmake args or cmake generator) then re-run the configure step.
   # Fixes issue https://gitlab.kitware.com/cmake/cmake/-/issues/10258
   #
-  if(NOT EXISTS ${tmp_dir}/${name}-cfgcmd.txt.in)
-    file(WRITE ${tmp_dir}/${name}-cfgcmd.txt.in "cmd='\@cmd\@'\n")
-  endif()
-  configure_file(${tmp_dir}/${name}-cfgcmd.txt.in ${tmp_dir}/${name}-cfgcmd.txt)
+  configure_file(
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ExternalProject/cfgcmd.txt.in
+    ${tmp_dir}/${name}-cfgcmd.txt
+    @ONLY
+  )
   list(APPEND file_deps ${tmp_dir}/${name}-cfgcmd.txt)
   list(APPEND file_deps ${_ep_cache_args_script})
 
-  get_property(log TARGET ${name} PROPERTY _EP_LOG_CONFIGURE)
+  get_property(log
+    TARGET ${name}
+    PROPERTY _EP_LOG_CONFIGURE
+  )
   if(log)
     set(log LOG 1)
   else()
     set(log "")
   endif()
 
-  get_property(uses_terminal TARGET ${name} PROPERTY
-    _EP_USES_TERMINAL_CONFIGURE)
+  get_property(uses_terminal
+    TARGET ${name}
+    PROPERTY _EP_USES_TERMINAL_CONFIGURE
+  )
   if(uses_terminal)
     set(uses_terminal USES_TERMINAL 1)
   else()
@@ -3296,7 +3709,7 @@ function(_ep_add_configure_command name)
       DEPENDS \${file_deps}
       ${log}
       ${uses_terminal}
-      )"
+    )"
   )
 endfunction()
 
@@ -3305,43 +3718,63 @@ function(_ep_add_build_command name)
   ExternalProject_Get_Property(${name} binary_dir)
 
   set(file_deps)
-  get_property(configure_handled_by_build TARGET ${name}
-               PROPERTY _EP_CONFIGURE_HANDLED_BY_BUILD)
+  get_property(configure_handled_by_build
+    TARGET ${name}
+    PROPERTY _EP_CONFIGURE_HANDLED_BY_BUILD
+  )
   if(configure_handled_by_build)
     # Depend on other external projects (file-level)
     _ep_get_file_deps(file_deps ${name})
   endif()
 
-  get_property(cmd_set TARGET ${name} PROPERTY _EP_BUILD_COMMAND SET)
+  get_property(cmd_set
+    TARGET ${name}
+    PROPERTY _EP_BUILD_COMMAND
+    SET
+  )
   if(cmd_set)
-    get_property(cmd TARGET ${name} PROPERTY _EP_BUILD_COMMAND)
+    get_property(cmd
+      TARGET ${name}
+      PROPERTY _EP_BUILD_COMMAND
+    )
   else()
     _ep_get_build_command(${name} BUILD cmd)
   endif()
 
-  get_property(log TARGET ${name} PROPERTY _EP_LOG_BUILD)
+  get_property(log
+    TARGET ${name}
+    PROPERTY _EP_LOG_BUILD
+  )
   if(log)
     set(log LOG 1)
   else()
     set(log "")
   endif()
 
-  get_property(uses_terminal TARGET ${name} PROPERTY
-    _EP_USES_TERMINAL_BUILD)
+  get_property(uses_terminal
+    TARGET ${name}
+    PROPERTY _EP_USES_TERMINAL_BUILD
+  )
   if(uses_terminal)
     set(uses_terminal USES_TERMINAL 1)
   else()
     set(uses_terminal "")
   endif()
 
-  get_property(build_always TARGET ${name} PROPERTY _EP_BUILD_ALWAYS)
+  get_property(build_always
+    TARGET ${name}
+    PROPERTY _EP_BUILD_ALWAYS
+  )
   if(build_always)
     set(always 1)
   else()
     set(always 0)
   endif()
 
-  get_property(build_byproducts TARGET ${name} PROPERTY _EP_BUILD_BYPRODUCTS)
+  get_property(build_byproducts
+    TARGET ${name}
+    PROPERTY _EP_BUILD_BYPRODUCTS
+  )
 
   set(__cmdQuoted)
   foreach(__item IN LISTS cmd)
@@ -3358,7 +3791,7 @@ function(_ep_add_build_command name)
       ALWAYS \${always}
       ${log}
       ${uses_terminal}
-      )"
+    )"
   )
 endfunction()
 
@@ -3366,28 +3799,53 @@ endfunction()
 function(_ep_add_install_command name)
   ExternalProject_Get_Property(${name} binary_dir)
 
-  get_property(cmd_set TARGET ${name} PROPERTY _EP_INSTALL_COMMAND SET)
+  get_property(cmd_set
+    TARGET ${name}
+    PROPERTY _EP_INSTALL_COMMAND
+    SET
+  )
   if(cmd_set)
-    get_property(cmd TARGET ${name} PROPERTY _EP_INSTALL_COMMAND)
+    get_property(cmd
+      TARGET ${name}
+      PROPERTY _EP_INSTALL_COMMAND
+    )
   else()
     _ep_get_build_command(${name} INSTALL cmd)
   endif()
 
-  get_property(log TARGET ${name} PROPERTY _EP_LOG_INSTALL)
+  get_property(log
+    TARGET ${name}
+    PROPERTY _EP_LOG_INSTALL
+  )
   if(log)
     set(log LOG 1)
   else()
     set(log "")
   endif()
 
-  get_property(uses_terminal TARGET ${name} PROPERTY
-    _EP_USES_TERMINAL_INSTALL)
+  get_property(uses_terminal
+    TARGET ${name}
+    PROPERTY _EP_USES_TERMINAL_INSTALL
+  )
   if(uses_terminal)
     set(uses_terminal USES_TERMINAL 1)
   else()
     set(uses_terminal "")
   endif()
 
+  # With BUILD_ALWAYS+BUILD_BYPRODUCTS, Ninja restats the
+  # build step outputs and may not consider this step to
+  # be out-of-date.  Explicitly mark it out-of-date too.
+  get_property(build_always
+    TARGET ${name}
+    PROPERTY _EP_BUILD_ALWAYS
+  )
+  if(build_always)
+    set(always 1)
+  else()
+    set(always 0)
+  endif()
+
   set(__cmdQuoted)
   foreach(__item IN LISTS cmd)
     string(APPEND __cmdQuoted " [==[${__item}]==]")
@@ -3398,9 +3856,10 @@ function(_ep_add_install_command name)
       COMMAND ${__cmdQuoted}
       WORKING_DIRECTORY \${binary_dir}
       DEPENDEES build
+      ALWAYS \${always}
       ${log}
       ${uses_terminal}
-      )"
+    )"
   )
 endfunction()
 
@@ -3418,7 +3877,10 @@ function(_ep_add_test_command name)
   #
   if(cmd_set OR before OR after OR exclude)
     if(cmd_set)
-      get_property(cmd TARGET ${name} PROPERTY _EP_TEST_COMMAND)
+      get_property(cmd
+        TARGET ${name}
+        PROPERTY _EP_TEST_COMMAND
+      )
     else()
       _ep_get_build_command(${name} TEST cmd)
     endif()
@@ -3441,15 +3903,20 @@ function(_ep_add_test_command name)
       set(exclude_args "")
     endif()
 
-    get_property(log TARGET ${name} PROPERTY _EP_LOG_TEST)
+    get_property(log
+      TARGET ${name}
+      PROPERTY _EP_LOG_TEST
+    )
     if(log)
       set(log LOG 1)
     else()
       set(log "")
     endif()
 
-    get_property(uses_terminal TARGET ${name} PROPERTY
-      _EP_USES_TERMINAL_TEST)
+    get_property(uses_terminal
+      TARGET ${name}
+      PROPERTY _EP_USES_TERMINAL_TEST
+    )
     if(uses_terminal)
       set(uses_terminal USES_TERMINAL 1)
     else()
@@ -3470,7 +3937,7 @@ function(_ep_add_test_command name)
         ${exclude_args}
         ${log}
         ${uses_terminal}
-        )"
+      )"
     )
   endif()
 endfunction()
@@ -3479,11 +3946,12 @@ endfunction()
 function(ExternalProject_Add name)
   cmake_policy(GET CMP0097 _EP_CMP0097
     PARENT_SCOPE # undocumented, do not use outside of CMake
-    )
+  )
   cmake_policy(GET CMP0114 cmp0114
     PARENT_SCOPE # undocumented, do not use outside of CMake
-    )
-  if(CMAKE_XCODE_BUILD_SYSTEM VERSION_GREATER_EQUAL 12 AND NOT cmp0114 STREQUAL "NEW")
+  )
+  if(CMAKE_XCODE_BUILD_SYSTEM VERSION_GREATER_EQUAL 12 AND
+     NOT cmp0114 STREQUAL "NEW")
     message(AUTHOR_WARNING
       "Policy CMP0114 is not set to NEW.  "
       "In order to support the Xcode \"new build system\", "
@@ -3492,11 +3960,14 @@ function(ExternalProject_Add name)
       "Since CMake is generating for the Xcode \"new build system\", "
       "ExternalProject_Add will use policy CMP0114's NEW behavior anyway, "
       "but the generated build system may not match what the project intends."
-      )
+    )
     set(cmp0114 "NEW")
   endif()
+  cmake_policy(GET CMP0135 _EP_CMP0135
+    PARENT_SCOPE # undocumented, do not use outside of CMake
+  )
 
-  _ep_get_configuration_subdir_suffix(cfgdir)
+  _ep_get_configuration_subdir_genex(cfgdir)
 
   # Add a custom target for the external project.
   set(cmf_dir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles)
@@ -3513,11 +3984,12 @@ function(ExternalProject_Add name)
   # argument was passed, we explicitly set it for the target.
   add_custom_target(${name} ALL DEPENDS ${complete_stamp_file})
   cmake_policy(POP)
-  set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1)
-  set_property(TARGET ${name} PROPERTY LABELS ${name})
-  set_property(TARGET ${name} PROPERTY FOLDER "ExternalProjectTargets/${name}")
-
-  set_property(TARGET ${name} PROPERTY _EP_CMP0114 "${cmp0114}")
+  set_target_properties(${name} PROPERTIES
+    _EP_IS_EXTERNAL_PROJECT 1
+    LABELS ${name}
+    FOLDER "ExternalProjectTargets/${name}"
+    _EP_CMP0114 "${cmp0114}"
+  )
 
   set(keywords
     #
@@ -3540,6 +4012,7 @@ function(ExternalProject_Add name)
     URL_HASH
     URL_MD5
     DOWNLOAD_NAME
+    DOWNLOAD_EXTRACT_TIMESTAMP
     DOWNLOAD_NO_EXTRACT
     DOWNLOAD_NO_PROGRESS
     TIMEOUT
@@ -3632,6 +4105,7 @@ function(ExternalProject_Add name)
     #
     USES_TERMINAL_DOWNLOAD
     USES_TERMINAL_UPDATE
+    USES_TERMINAL_PATCH
     USES_TERMINAL_CONFIGURE
     USES_TERMINAL_BUILD
     USES_TERMINAL_INSTALL
@@ -3648,13 +4122,22 @@ function(ExternalProject_Add name)
     #
     LIST_SEPARATOR
   )
-  _ep_parse_arguments(ExternalProject_Add "${keywords}" ${name} _EP_ "${ARGN}")
+  _ep_parse_arguments(
+    ExternalProject_Add
+    "${keywords}"
+    ${name}
+    _EP_
+    "${ARGN}"
+  )
   _ep_set_directories(${name})
   _ep_get_step_stampfile(${name} "done" done_stamp_file)
   _ep_get_step_stampfile(${name} "install" install_stamp_file)
 
   # Set the EXCLUDE_FROM_ALL target property if required.
-  get_property(exclude_from_all TARGET ${name} PROPERTY _EP_EXCLUDE_FROM_ALL)
+  get_property(exclude_from_all
+    TARGET ${name}
+    PROPERTY _EP_EXCLUDE_FROM_ALL
+  )
   if(exclude_from_all)
     set_property(TARGET ${name} PROPERTY EXCLUDE_FROM_ALL TRUE)
   endif()
@@ -3681,11 +4164,13 @@ function(ExternalProject_Add name)
     COMMAND ${CMAKE_COMMAND} -E touch ${done_stamp_file}
     DEPENDS ${install_stamp_file}
     VERBATIM
-    )
-
+  )
 
   # Depend on other external projects (target-level).
-  get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
+  get_property(deps
+    TARGET ${name}
+    PROPERTY _EP_DEPENDS
+  )
   foreach(arg IN LISTS deps)
     add_dependencies(${name} ${arg})
   endforeach()
diff --git a/deps/cmake/share/cmake-3.25/Modules/ExternalProject/RepositoryInfo.txt.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/RepositoryInfo.txt.in
new file mode 100644
index 00000000..b81850fb
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/RepositoryInfo.txt.in
@@ -0,0 +1,9 @@
+# This is a generated file and its contents are an internal implementation detail.
+# The download step will be re-executed if anything in this file changes.
+# No other meaning or use of this file is supported.
+
+method=@method@
+command=@cmd@
+source_dir=@source_dir@
+work_dir=@work_dir@
+@extra_repo_info@
diff --git a/deps/cmake/share/cmake-3.25/Modules/ExternalProject/cfgcmd.txt.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/cfgcmd.txt.in
new file mode 100644
index 00000000..b3f09efc
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/cfgcmd.txt.in
@@ -0,0 +1 @@
+cmd='@cmd@'
diff --git a/deps/cmake/share/cmake-3.21/Modules/ExternalProject-download.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/download.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/ExternalProject-download.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/ExternalProject/download.cmake.in
diff --git a/deps/cmake/share/cmake-3.25/Modules/ExternalProject/extractfile.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/extractfile.cmake.in
new file mode 100644
index 00000000..984565bc
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/extractfile.cmake.in
@@ -0,0 +1,65 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+cmake_minimum_required(VERSION 3.5)
+
+# Make file names absolute:
+#
+get_filename_component(filename "@filename@" ABSOLUTE)
+get_filename_component(directory "@directory@" ABSOLUTE)
+
+message(STATUS "extracting...
+     src='${filename}'
+     dst='${directory}'"
+)
+
+if(NOT EXISTS "${filename}")
+  message(FATAL_ERROR "File to extract does not exist: '${filename}'")
+endif()
+
+# Prepare a space for extracting:
+#
+set(i 1234)
+while(EXISTS "${directory}/../ex-@name@${i}")
+  math(EXPR i "${i} + 1")
+endwhile()
+set(ut_dir "${directory}/../ex-@name@${i}")
+file(MAKE_DIRECTORY "${ut_dir}")
+
+# Extract it:
+#
+message(STATUS "extracting... [tar @args@]")
+execute_process(COMMAND ${CMAKE_COMMAND} -E tar @args@ ${filename} @options@
+  WORKING_DIRECTORY ${ut_dir}
+  RESULT_VARIABLE rv
+)
+
+if(NOT rv EQUAL 0)
+  message(STATUS "extracting... [error clean up]")
+  file(REMOVE_RECURSE "${ut_dir}")
+  message(FATAL_ERROR "Extract of '${filename}' failed")
+endif()
+
+# Analyze what came out of the tar file:
+#
+message(STATUS "extracting... [analysis]")
+file(GLOB contents "${ut_dir}/*")
+list(REMOVE_ITEM contents "${ut_dir}/.DS_Store")
+list(LENGTH contents n)
+if(NOT n EQUAL 1 OR NOT IS_DIRECTORY "${contents}")
+  set(contents "${ut_dir}")
+endif()
+
+# Move "the one" directory to the final directory:
+#
+message(STATUS "extracting... [rename]")
+file(REMOVE_RECURSE ${directory})
+get_filename_component(contents ${contents} ABSOLUTE)
+file(RENAME ${contents} ${directory})
+
+# Clean up:
+#
+message(STATUS "extracting... [clean up]")
+file(REMOVE_RECURSE "${ut_dir}")
+
+message(STATUS "extracting... done")
diff --git a/deps/cmake/share/cmake-3.25/Modules/ExternalProject/gitclone.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/gitclone.cmake.in
new file mode 100644
index 00000000..3312171e
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/gitclone.cmake.in
@@ -0,0 +1,73 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+cmake_minimum_required(VERSION 3.5)
+
+if(EXISTS "@gitclone_stampfile@" AND EXISTS "@gitclone_infofile@" AND
+  "@gitclone_stampfile@" IS_NEWER_THAN "@gitclone_infofile@")
+  message(STATUS
+    "Avoiding repeated git clone, stamp file is up to date: "
+    "'@gitclone_stampfile@'"
+  )
+  return()
+endif()
+
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E rm -rf "@source_dir@"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to remove directory: '@source_dir@'")
+endif()
+
+# try the clone 3 times in case there is an odd git clone issue
+set(error_code 1)
+set(number_of_tries 0)
+while(error_code AND number_of_tries LESS 3)
+  execute_process(
+    COMMAND "@git_EXECUTABLE@" @git_options@
+            clone @git_clone_options@ "@git_repository@" "@src_name@"
+    WORKING_DIRECTORY "@work_dir@"
+    RESULT_VARIABLE error_code
+  )
+  math(EXPR number_of_tries "${number_of_tries} + 1")
+endwhile()
+if(number_of_tries GREATER 1)
+  message(STATUS "Had to git clone more than once: ${number_of_tries} times.")
+endif()
+if(error_code)
+  message(FATAL_ERROR "Failed to clone repository: '@git_repository@'")
+endif()
+
+execute_process(
+  COMMAND "@git_EXECUTABLE@" @git_options@
+          checkout "@git_tag@" @git_checkout_explicit--@
+  WORKING_DIRECTORY "@work_dir@/@src_name@"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to checkout tag: '@git_tag@'")
+endif()
+
+set(init_submodules @init_submodules@)
+if(init_submodules)
+  execute_process(
+    COMMAND "@git_EXECUTABLE@" @git_options@
+            submodule update @git_submodules_recurse@ --init @git_submodules@
+    WORKING_DIRECTORY "@work_dir@/@src_name@"
+    RESULT_VARIABLE error_code
+  )
+endif()
+if(error_code)
+  message(FATAL_ERROR "Failed to update submodules in: '@work_dir@/@src_name@'")
+endif()
+
+# Complete success, update the script-last-run stamp file:
+#
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E copy "@gitclone_infofile@" "@gitclone_stampfile@"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to copy script-last-run stamp file: '@gitclone_stampfile@'")
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/ExternalProject-gitupdate.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/gitupdate.cmake.in
similarity index 85%
rename from deps/cmake/share/cmake-3.21/Modules/ExternalProject-gitupdate.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/ExternalProject/gitupdate.cmake.in
index 0de2372e..50f01670 100644
--- a/deps/cmake/share/cmake-3.21/Modules/ExternalProject-gitupdate.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/gitupdate.cmake.in
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.5)
 
 function(get_hash_for_ref ref out_var err_var)
   execute_process(
-    COMMAND "@git_EXECUTABLE@" rev-parse "${ref}^0"
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git rev-parse "${ref}^0"
     WORKING_DIRECTORY "@work_dir@"
     RESULT_VARIABLE error_code
     OUTPUT_VARIABLE ref_hash
@@ -27,7 +27,7 @@ endif()
 
 
 execute_process(
-  COMMAND "@git_EXECUTABLE@" show-ref "@git_tag@"
+  COMMAND "@git_EXECUTABLE@" --git-dir=.git show-ref "@git_tag@"
   WORKING_DIRECTORY "@work_dir@"
   OUTPUT_VARIABLE show_ref_output
 )
@@ -95,7 +95,7 @@ endif()
 if(fetch_required)
   message(VERBOSE "Fetching latest from the remote @git_remote_name@")
   execute_process(
-    COMMAND "@git_EXECUTABLE@" fetch --tags --force "@git_remote_name@"
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git fetch --tags --force "@git_remote_name@"
     WORKING_DIRECTORY "@work_dir@"
     COMMAND_ERROR_IS_FATAL ANY
   )
@@ -112,7 +112,7 @@ if(git_update_strategy MATCHES "^REBASE(_CHECKOUT)?$")
   # We can't if we aren't already on a branch and we shouldn't if that local
   # branch isn't tracking the one we want to checkout.
   execute_process(
-    COMMAND "@git_EXECUTABLE@" symbolic-ref -q HEAD
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git symbolic-ref -q HEAD
     WORKING_DIRECTORY "@work_dir@"
     OUTPUT_VARIABLE current_branch
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -128,7 +128,7 @@ if(git_update_strategy MATCHES "^REBASE(_CHECKOUT)?$")
 
   else()
     execute_process(
-      COMMAND "@git_EXECUTABLE@" for-each-ref "--format='%(upstream:short)'" "${current_branch}"
+      COMMAND "@git_EXECUTABLE@" --git-dir=.git for-each-ref "--format=%(upstream:short)" "${current_branch}"
       WORKING_DIRECTORY "@work_dir@"
       OUTPUT_VARIABLE upstream_branch
       OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -151,7 +151,7 @@ endif()
 
 # Check if stash is needed
 execute_process(
-  COMMAND "@git_EXECUTABLE@" status --porcelain
+  COMMAND "@git_EXECUTABLE@" --git-dir=.git status --porcelain
   WORKING_DIRECTORY "@work_dir@"
   RESULT_VARIABLE error_code
   OUTPUT_VARIABLE repo_status
@@ -165,7 +165,7 @@ string(LENGTH "${repo_status}" need_stash)
 # rebase or checkout without losing those changes permanently
 if(need_stash)
   execute_process(
-    COMMAND "@git_EXECUTABLE@" stash save @git_stash_save_options@
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git stash save @git_stash_save_options@
     WORKING_DIRECTORY "@work_dir@"
     COMMAND_ERROR_IS_FATAL ANY
   )
@@ -173,13 +173,13 @@ endif()
 
 if(git_update_strategy STREQUAL "CHECKOUT")
   execute_process(
-    COMMAND "@git_EXECUTABLE@" checkout "${checkout_name}"
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git checkout "${checkout_name}"
     WORKING_DIRECTORY "@work_dir@"
     COMMAND_ERROR_IS_FATAL ANY
   )
 else()
   execute_process(
-    COMMAND "@git_EXECUTABLE@" rebase "${checkout_name}"
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git rebase "${checkout_name}"
     WORKING_DIRECTORY "@work_dir@"
     RESULT_VARIABLE error_code
     OUTPUT_VARIABLE rebase_output
@@ -188,7 +188,7 @@ else()
   if(error_code)
     # Rebase failed, undo the rebase attempt before continuing
     execute_process(
-      COMMAND "@git_EXECUTABLE@" rebase --abort
+      COMMAND "@git_EXECUTABLE@" --git-dir=.git rebase --abort
       WORKING_DIRECTORY "@work_dir@"
     )
 
@@ -196,7 +196,7 @@ else()
       # Not allowed to do a checkout as a fallback, so cannot proceed
       if(need_stash)
         execute_process(
-          COMMAND "@git_EXECUTABLE@" stash pop --index --quiet
+          COMMAND "@git_EXECUTABLE@" --git-dir=.git stash pop --index --quiet
           WORKING_DIRECTORY "@work_dir@"
           )
       endif()
@@ -218,7 +218,7 @@ else()
     message(WARNING "Rebase failed, output has been saved to ${error_log_file}"
                     "\nFalling back to checkout, previous commit tagged as ${tag_name}")
     execute_process(
-      COMMAND "@git_EXECUTABLE@" tag -a
+      COMMAND "@git_EXECUTABLE@" --git-dir=.git tag -a
               -m "ExternalProject attempting to move from here to ${checkout_name}"
               ${tag_name}
       WORKING_DIRECTORY "@work_dir@"
@@ -226,7 +226,7 @@ else()
     )
 
     execute_process(
-      COMMAND "@git_EXECUTABLE@" checkout "${checkout_name}"
+      COMMAND "@git_EXECUTABLE@" --git-dir=.git checkout "${checkout_name}"
       WORKING_DIRECTORY "@work_dir@"
       COMMAND_ERROR_IS_FATAL ANY
     )
@@ -236,29 +236,29 @@ endif()
 if(need_stash)
   # Put back the stashed changes
   execute_process(
-    COMMAND "@git_EXECUTABLE@" stash pop --index --quiet
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git stash pop --index --quiet
     WORKING_DIRECTORY "@work_dir@"
     RESULT_VARIABLE error_code
     )
   if(error_code)
     # Stash pop --index failed: Try again dropping the index
     execute_process(
-      COMMAND "@git_EXECUTABLE@" reset --hard --quiet
+      COMMAND "@git_EXECUTABLE@" --git-dir=.git reset --hard --quiet
       WORKING_DIRECTORY "@work_dir@"
     )
     execute_process(
-      COMMAND "@git_EXECUTABLE@" stash pop --quiet
+      COMMAND "@git_EXECUTABLE@" --git-dir=.git stash pop --quiet
       WORKING_DIRECTORY "@work_dir@"
       RESULT_VARIABLE error_code
     )
     if(error_code)
       # Stash pop failed: Restore previous state.
       execute_process(
-        COMMAND "@git_EXECUTABLE@" reset --hard --quiet ${head_sha}
+        COMMAND "@git_EXECUTABLE@" --git-dir=.git reset --hard --quiet ${head_sha}
         WORKING_DIRECTORY "@work_dir@"
       )
       execute_process(
-        COMMAND "@git_EXECUTABLE@" stash pop --index --quiet
+        COMMAND "@git_EXECUTABLE@" --git-dir=.git stash pop --index --quiet
         WORKING_DIRECTORY "@work_dir@"
       )
       message(FATAL_ERROR "\nFailed to unstash changes in: '@work_dir@'."
@@ -270,7 +270,7 @@ endif()
 set(init_submodules "@init_submodules@")
 if(init_submodules)
   execute_process(
-    COMMAND "@git_EXECUTABLE@" submodule update @git_submodules_recurse@ --init @git_submodules@
+    COMMAND "@git_EXECUTABLE@" --git-dir=.git submodule update @git_submodules_recurse@ --init @git_submodules@
     WORKING_DIRECTORY "@work_dir@"
     COMMAND_ERROR_IS_FATAL ANY
   )
diff --git a/deps/cmake/share/cmake-3.25/Modules/ExternalProject/hgclone.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/hgclone.cmake.in
new file mode 100644
index 00000000..e2b55ba4
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/hgclone.cmake.in
@@ -0,0 +1,49 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+cmake_minimum_required(VERSION 3.5)
+
+if(EXISTS "@hgclone_stampfile@" AND EXISTS "@hgclone_infofile@" AND
+  "@hgclone_stampfile@" IS_NEWER_THAN "@hgclone_infofile@")
+  message(STATUS
+    "Avoiding repeated hg clone, stamp file is up to date: "
+    "'@hgclone_stampfile@'"
+  )
+  return()
+endif()
+
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E rm -rf "@source_dir@"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to remove directory: '@source_dir@'")
+endif()
+
+execute_process(
+  COMMAND "@hg_EXECUTABLE@" clone -U "@hg_repository@" "@src_name@"
+  WORKING_DIRECTORY "@work_dir@"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to clone repository: '@hg_repository@'")
+endif()
+
+execute_process(
+  COMMAND "@hg_EXECUTABLE@" update @hg_tag@
+  WORKING_DIRECTORY "@work_dir@/@src_name@"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to checkout tag: '@hg_tag@'")
+endif()
+
+# Complete success, update the script-last-run stamp file:
+#
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E copy "@hgclone_infofile@" "@hgclone_stampfile@"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to copy script-last-run stamp file: '@hgclone_stampfile@'")
+endif()
diff --git a/deps/cmake/share/cmake-3.25/Modules/ExternalProject/mkdirs.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/mkdirs.cmake.in
new file mode 100644
index 00000000..bb835cf4
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/mkdirs.cmake.in
@@ -0,0 +1,22 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+cmake_minimum_required(VERSION 3.5)
+
+file(MAKE_DIRECTORY
+  "@source_dir@"
+  "@binary_dir@"
+  "@install_dir@"
+  "@tmp_dir@"
+  "@stamp_dir@"
+  "@download_dir@"
+  "@log_dir@"
+)
+
+set(configSubDirs @CMAKE_CONFIGURATION_TYPES@)
+foreach(subDir IN LISTS configSubDirs)
+    file(MAKE_DIRECTORY "@stamp_dir@/${subDir}")
+endforeach()
+if(cfgdir)
+  file(MAKE_DIRECTORY "@stamp_dir@${cfgdir}") # cfgdir has leading slash
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/ExternalProject-verify.cmake.in b/deps/cmake/share/cmake-3.25/Modules/ExternalProject/verify.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/ExternalProject-verify.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/ExternalProject/verify.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FLTKCompatibility.cmake b/deps/cmake/share/cmake-3.25/Modules/FLTKCompatibility.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FLTKCompatibility.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FLTKCompatibility.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FeatureSummary.cmake b/deps/cmake/share/cmake-3.25/Modules/FeatureSummary.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FeatureSummary.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FeatureSummary.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/FetchContent.cmake b/deps/cmake/share/cmake-3.25/Modules/FetchContent.cmake
new file mode 100644
index 00000000..ac3918cf
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FetchContent.cmake
@@ -0,0 +1,2020 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FetchContent
+------------------
+
+.. versionadded:: 3.11
+
+.. only:: html
+
+  .. contents::
+
+.. note:: The :guide:`Using Dependencies Guide` provides a high-level
+  introduction to this general topic. It provides a broader overview of
+  where the ``FetchContent`` module fits into the bigger picture,
+  including its relationship to the :command:`find_package` command.
+  The guide is recommended pre-reading before moving on to the details below.
+
+Overview
+^^^^^^^^
+
+This module enables populating content at configure time via any method
+supported by the :module:`ExternalProject` module.  Whereas
+:command:`ExternalProject_Add` downloads at build time, the
+``FetchContent`` module makes content available immediately, allowing the
+configure step to use the content in commands like :command:`add_subdirectory`,
+:command:`include` or :command:`file` operations.
+
+Content population details should be defined separately from the command that
+performs the actual population.  This separation ensures that all the
+dependency details are defined before anything might try to use them to
+populate content.  This is particularly important in more complex project
+hierarchies where dependencies may be shared between multiple projects.
+
+The following shows a typical example of declaring content details for some
+dependencies and then ensuring they are populated with a separate call:
+
+.. code-block:: cmake
+
+  FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
+  )
+  FetchContent_Declare(
+    myCompanyIcons
+    URL      https://intranet.mycompany.com/assets/iconset_1.12.tar.gz
+    URL_HASH MD5=5588a7b18261c20068beabfb4f530b87
+  )
+
+  FetchContent_MakeAvailable(googletest myCompanyIcons)
+
+The :command:`FetchContent_MakeAvailable` command ensures the named
+dependencies have been populated, either by an earlier call or by populating
+them itself.  When performing the population, it will also add them to the
+main build, if possible, so that the main build can use the populated
+projects' targets, etc.  See the command's documentation for how these steps
+are performed.
+
+When using a hierarchical project arrangement, projects at higher levels in
+the hierarchy are able to override the declared details of content specified
+anywhere lower in the project hierarchy.  The first details to be declared
+for a given dependency take precedence, regardless of where in the project
+hierarchy that occurs.  Similarly, the first call that tries to populate a
+dependency "wins", with subsequent populations reusing the result of the
+first instead of repeating the population again.
+See the :ref:`Examples <fetch-content-examples>` which demonstrate
+this scenario.
+
+In some cases, the main project may need to have more precise control over
+the population, or it may be required to explicitly define the population
+steps in a way that cannot be captured by the declared details alone.
+For such situations, the lower level :command:`FetchContent_GetProperties` and
+:command:`FetchContent_Populate` commands can be used.  These lack the richer
+features provided by :command:`FetchContent_MakeAvailable` though, so their
+direct use should be considered a last resort.  The typical pattern of such
+custom steps looks like this:
+
+.. code-block:: cmake
+
+  # NOTE: Where possible, prefer to use FetchContent_MakeAvailable()
+  #       instead of custom logic like this
+
+  # Check if population has already been performed
+  FetchContent_GetProperties(depname)
+  if(NOT depname_POPULATED)
+    # Fetch the content using previously declared details
+    FetchContent_Populate(depname)
+
+    # Set custom variables, policies, etc.
+    # ...
+
+    # Bring the populated content into the build
+    add_subdirectory(${depname_SOURCE_DIR} ${depname_BINARY_DIR})
+  endif()
+
+The ``FetchContent`` module also supports defining and populating
+content in a single call, with no check for whether the content has been
+populated elsewhere already.  This should not be done in projects, but may
+be appropriate for populating content in CMake's script mode.
+See :command:`FetchContent_Populate` for details.
+
+Commands
+^^^^^^^^
+
+.. command:: FetchContent_Declare
+
+  .. code-block:: cmake
+
+    FetchContent_Declare(
+      <name>
+      <contentOptions>...
+      [SYSTEM]
+      [OVERRIDE_FIND_PACKAGE |
+       FIND_PACKAGE_ARGS args...]
+    )
+
+  The ``FetchContent_Declare()`` function records the options that describe
+  how to populate the specified content.  If such details have already
+  been recorded earlier in this project (regardless of where in the project
+  hierarchy), this and all later calls for the same content ``<name>`` are
+  ignored.  This "first to record, wins" approach is what allows hierarchical
+  projects to have parent projects override content details of child projects.
+
+  The content ``<name>`` can be any string without spaces, but good practice
+  would be to use only letters, numbers and underscores.  The name will be
+  treated case-insensitively and it should be obvious for the content it
+  represents, often being the name of the child project or the value given
+  to its top level :command:`project` command (if it is a CMake project).
+  For well-known public projects, the name should generally be the official
+  name of the project.  Choosing an unusual name makes it unlikely that other
+  projects needing that same content will use the same name, leading to
+  the content being populated multiple times.
+
+  The ``<contentOptions>`` can be any of the download, update or patch options
+  that the :command:`ExternalProject_Add` command understands.  The configure,
+  build, install and test steps are explicitly disabled and therefore options
+  related to them will be ignored.  The ``SOURCE_SUBDIR`` option is an
+  exception, see :command:`FetchContent_MakeAvailable` for details on how that
+  affects behavior.
+
+  In most cases, ``<contentOptions>`` will just be a couple of options defining
+  the download method and method-specific details like a commit tag or archive
+  hash.  For example:
+
+  .. code-block:: cmake
+
+    FetchContent_Declare(
+      googletest
+      GIT_REPOSITORY https://github.com/google/googletest.git
+      GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
+    )
+
+    FetchContent_Declare(
+      myCompanyIcons
+      URL      https://intranet.mycompany.com/assets/iconset_1.12.tar.gz
+      URL_HASH MD5=5588a7b18261c20068beabfb4f530b87
+    )
+
+    FetchContent_Declare(
+      myCompanyCertificates
+      SVN_REPOSITORY svn+ssh://svn.mycompany.com/srv/svn/trunk/certs
+      SVN_REVISION   -r12345
+    )
+
+  Where contents are being fetched from a remote location and you do not
+  control that server, it is advisable to use a hash for ``GIT_TAG`` rather
+  than a branch or tag name.  A commit hash is more secure and helps to
+  confirm that the downloaded contents are what you expected.
+
+  .. versionchanged:: 3.14
+    Commands for the download, update or patch steps can access the terminal.
+    This may be needed for things like password prompts or real-time display
+    of command progress.
+
+  .. versionadded:: 3.22
+    The :variable:`CMAKE_TLS_VERIFY`, :variable:`CMAKE_TLS_CAINFO`,
+    :variable:`CMAKE_NETRC` and :variable:`CMAKE_NETRC_FILE` variables now
+    provide the defaults for their corresponding content options, just like
+    they do for :command:`ExternalProject_Add`. Previously, these variables
+    were ignored by the ``FetchContent`` module.
+
+  .. versionadded:: 3.24
+
+    ``FIND_PACKAGE_ARGS``
+      This option is for scenarios where the
+      :command:`FetchContent_MakeAvailable` command may first try a call to
+      :command:`find_package` to satisfy the dependency for ``<name>``.
+      By default, such a call would be simply ``find_package(<name>)``, but
+      ``FIND_PACKAGE_ARGS`` can be used to provide additional arguments to be
+      appended after the ``<name>``.  ``FIND_PACKAGE_ARGS`` can also be given
+      with nothing after it, which indicates that :command:`find_package` can
+      still be called if :variable:`FETCHCONTENT_TRY_FIND_PACKAGE_MODE` is
+      set to ``OPT_IN`` or is not set.
+
+      Everything after the ``FIND_PACKAGE_ARGS`` keyword is appended to the
+      :command:`find_package` call, so all other ``<contentOptions>`` must
+      come before the ``FIND_PACKAGE_ARGS`` keyword.  If the
+      :variable:`CMAKE_FIND_PACKAGE_TARGETS_GLOBAL` variable is set to true
+      at the time ``FetchContent_Declare()`` is called, a ``GLOBAL`` keyword
+      will be appended to the :command:`find_package` arguments if it was
+      not already specified.  It will also be appended if
+      ``FIND_PACKAGE_ARGS`` was not given, but
+      :variable:`FETCHCONTENT_TRY_FIND_PACKAGE_MODE` was set to ``ALWAYS``.
+
+      ``OVERRIDE_FIND_PACKAGE`` cannot be used when ``FIND_PACKAGE_ARGS`` is
+      given.
+
+      :ref:`dependency_providers` discusses another way that
+      :command:`FetchContent_MakeAvailable` calls can be redirected.
+      ``FIND_PACKAGE_ARGS`` is intended for project control, whereas
+      dependency providers allow users to override project behavior.
+
+    ``OVERRIDE_FIND_PACKAGE``
+      When a ``FetchContent_Declare(<name> ...)`` call includes this option,
+      subsequent calls to ``find_package(<name> ...)`` will ensure that
+      ``FetchContent_MakeAvailable(<name>)`` has been called, then use the
+      config package files in the :variable:`CMAKE_FIND_PACKAGE_REDIRECTS_DIR`
+      directory (which are usually created by ``FetchContent_MakeAvailable()``).
+      This effectively makes :command:`FetchContent_MakeAvailable` override
+      :command:`find_package` for the named dependency, allowing the former to
+      satisfy the package requirements of the latter.  ``FIND_PACKAGE_ARGS``
+      cannot be used when ``OVERRIDE_FIND_PACKAGE`` is given.
+
+      If a :ref:`dependency provider <dependency_providers>` has been set
+      and the project calls :command:`find_package` for the ``<name>``
+      dependency, ``OVERRIDE_FIND_PACKAGE`` will not prevent the provider
+      from seeing that call.  Dependency providers always have the opportunity
+      to intercept any direct call to :command:`find_package`, except if that
+      call contains the ``BYPASS_PROVIDER`` option.
+
+  .. versionadded:: 3.25
+
+    ``SYSTEM``
+      If the ``SYSTEM`` argument is provided, targets created by
+      the dependency will have their :prop_tgt:`SYSTEM` property
+      set to true when populated by :command:`FetchContent_MakeAvailable`.
+      The entries in their  :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES`
+      will be treated as ``SYSTEM`` include directories when
+      compiling consumers.
+
+.. command:: FetchContent_MakeAvailable
+
+  .. versionadded:: 3.14
+
+  .. code-block:: cmake
+
+    FetchContent_MakeAvailable(<name1> [<name2>...])
+
+  This command ensures that each of the named dependencies are made available
+  to the project by the time it returns.  There must have been a call to
+  :command:`FetchContent_Declare` for each dependency, and the first such call
+  will control how that dependency will be made available, as described below.
+
+  If ``<lowercaseName>_SOURCE_DIR`` is not set:
+
+  * .. versionadded:: 3.24
+
+      If a :ref:`dependency provider <dependency_providers>` is set, call the
+      provider's command with ``FETCHCONTENT_MAKEAVAILABLE_SERIAL`` as the
+      first argument, followed by the arguments of the first call to
+      :command:`FetchContent_Declare` for ``<name>``.  If ``SOURCE_DIR`` or
+      ``BINARY_DIR`` were not part of the original declared arguments, they
+      will be added with their default values.
+      If :variable:`FETCHCONTENT_TRY_FIND_PACKAGE_MODE` was set to ``NEVER``
+      when the details were declared, any ``FIND_PACKAGE_ARGS`` will be
+      omitted.  The ``OVERRIDE_FIND_PACKAGE`` keyword is also always omitted.
+      If the provider fulfilled the request, ``FetchContent_MakeAvailable()``
+      will consider that dependency handled, skip the remaining steps below
+      and move on to the next dependency in the list.
+
+  * .. versionadded:: 3.24
+
+      If permitted, :command:`find_package(<name> [<args>...]) <find_package>`
+      will be called, where ``<args>...`` may be provided by the
+      ``FIND_PACKAGE_ARGS`` option in :command:`FetchContent_Declare`.
+      The value of the :variable:`FETCHCONTENT_TRY_FIND_PACKAGE_MODE` variable
+      at the time :command:`FetchContent_Declare` was called determines whether
+      ``FetchContent_MakeAvailable()`` can call :command:`find_package`.
+      If the :variable:`CMAKE_FIND_PACKAGE_TARGETS_GLOBAL` variable is set to
+      true when ``FetchContent_MakeAvailable()`` is called, it still affects
+      any imported targets created when that in turn calls
+      :command:`find_package`, even if that variable was false when the
+      corresponding details were declared.
+
+  If the dependency was not satisfied by a provider or a
+  :command:`find_package` call, ``FetchContent_MakeAvailable()`` then uses
+  the following logic to make the dependency available:
+
+  * If the dependency has already been populated earlier in this run, set
+    the ``<lowercaseName>_POPULATED``, ``<lowercaseName>_SOURCE_DIR`` and
+    ``<lowercaseName>_BINARY_DIR`` variables in the same way as a call to
+    :command:`FetchContent_GetProperties`, then skip the remaining steps
+    below and move on to the next dependency in the list.
+
+  * Call :command:`FetchContent_Populate` to populate the dependency using
+    the details recorded by an earlier call to :command:`FetchContent_Declare`.
+    Halt with a fatal error if no such details have been recorded.
+    :variable:`FETCHCONTENT_SOURCE_DIR_<uppercaseName>` can be used to override
+    the declared details and use content provided at the specified location
+    instead.
+
+  * .. versionadded:: 3.24
+
+      Ensure the :variable:`CMAKE_FIND_PACKAGE_REDIRECTS_DIR` directory
+      contains a ``<lowercaseName>-config.cmake`` and a
+      ``<lowercaseName>-config-version.cmake`` file (or equivalently
+      ``<name>Config.cmake`` and ``<name>ConfigVersion.cmake``).
+      The directory that the :variable:`CMAKE_FIND_PACKAGE_REDIRECTS_DIR`
+      variable points to is cleared at the start of every CMake run.
+      If no config file exists when :command:`FetchContent_Populate` returns,
+      a minimal one will be written which :command:`includes <include>` any
+      ``<lowercaseName>-extra.cmake`` or ``<name>Extra.cmake`` file with the
+      ``OPTIONAL`` flag (so the files can be missing and won't generate a
+      warning).  Similarly, if no config version file exists, a very simple
+      one will be written which sets ``PACKAGE_VERSION_COMPATIBLE`` and
+      ``PACKAGE_VERSION_EXACT`` to true.  This ensures all future calls to
+      :command:`find_package()` for the dependency will use the redirected
+      config file, regardless of any version requirements.
+      CMake cannot automatically determine an arbitrary dependency's version,
+      so it cannot set ``PACKAGE_VERSION``.
+      When a dependency is pulled in via :command:`add_subdirectory` in the
+      next step, it may choose to overwrite the generated config version file
+      in :variable:`CMAKE_FIND_PACKAGE_REDIRECTS_DIR` with one that also sets
+      ``PACKAGE_VERSION``.
+      The dependency may also write a ``<lowercaseName>-extra.cmake`` or
+      ``<name>Extra.cmake`` file to perform custom processing or define any
+      variables that their normal (installed) package config file would
+      otherwise usually define (many projects don't do any custom processing
+      or set any variables and therefore have no need to do this).
+      If required, the main project can write these files instead if the
+      dependency project doesn't do so.  This allows the main project to
+      add missing details from older dependencies that haven't or can't be
+      updated to support this functionality.
+      See `Integrating With find_package()`_ for examples.
+
+  * If the top directory of the populated content contains a ``CMakeLists.txt``
+    file, call :command:`add_subdirectory` to add it to the main build.
+    It is not an error for there to be no ``CMakeLists.txt`` file, which
+    allows the command to be used for dependencies that make downloaded
+    content available at a known location, but which do not need or support
+    being added directly to the build.
+
+    .. versionadded:: 3.18
+      The ``SOURCE_SUBDIR`` option can be given in the declared details to
+      look somewhere below the top directory instead (i.e. the same way that
+      ``SOURCE_SUBDIR`` is used by the :command:`ExternalProject_Add`
+      command).  The path provided with ``SOURCE_SUBDIR`` must be relative
+      and will be treated as relative to the top directory.  It can also
+      point to a directory that does not contain a ``CMakeLists.txt`` file
+      or even to a directory that doesn't exist.  This can be used to avoid
+      adding a project that contains a ``CMakeLists.txt`` file in its top
+      directory.
+
+  Projects should aim to declare the details of all dependencies they might
+  use before they call ``FetchContent_MakeAvailable()`` for any of them.
+  This ensures that if any of the dependencies are also sub-dependencies of
+  one or more of the others, the main project still controls the details
+  that will be used (because it will declare them first before the
+  dependencies get a chance to).  In the following code samples, assume that
+  the ``uses_other`` dependency also uses ``FetchContent`` to add the ``other``
+  dependency internally:
+
+  .. code-block:: cmake
+
+    # WRONG: Should declare all details first
+    FetchContent_Declare(uses_other ...)
+    FetchContent_MakeAvailable(uses_other)
+
+    FetchContent_Declare(other ...)    # Will be ignored, uses_other beat us to it
+    FetchContent_MakeAvailable(other)  # Would use details declared by uses_other
+
+  .. code-block:: cmake
+
+    # CORRECT: All details declared first, so they will take priority
+    FetchContent_Declare(uses_other ...)
+    FetchContent_Declare(other ...)
+    FetchContent_MakeAvailable(uses_other other)
+
+  Note that :variable:`CMAKE_VERIFY_INTERFACE_HEADER_SETS` is explicitly set
+  to false upon entry to ``FetchContent_MakeAvailable()``, and is restored to
+  its original value before the command returns.  Developers typically only
+  want to verify header sets from the main project, not those from any
+  dependencies.  This local manipulation of the
+  :variable:`CMAKE_VERIFY_INTERFACE_HEADER_SETS` variable provides that
+  intuitive behavior.  You can use variables like
+  :variable:`CMAKE_PROJECT_INCLUDE` or
+  :variable:`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE` to turn verification back
+  on for all or some dependencies.  You can also set the
+  :prop_tgt:`VERIFY_INTERFACE_HEADER_SETS` property of individual targets.
+
+.. command:: FetchContent_Populate
+
+  .. note::
+    Where possible, prefer to use :command:`FetchContent_MakeAvailable`
+    instead of implementing population manually with this command.
+
+  .. code-block:: cmake
+
+    FetchContent_Populate(<name>)
+
+  In most cases, the only argument given to ``FetchContent_Populate()`` is the
+  ``<name>``.  When used this way, the command assumes the content details have
+  been recorded by an earlier call to :command:`FetchContent_Declare`.  The
+  details are stored in a global property, so they are unaffected by things
+  like variable or directory scope.  Therefore, it doesn't matter where in the
+  project the details were previously declared, as long as they have been
+  declared before the call to ``FetchContent_Populate()``.  Those saved details
+  are then used to construct a call to :command:`ExternalProject_Add` in a
+  private sub-build to perform the content population immediately.  The
+  implementation of ``ExternalProject_Add()`` ensures that if the content has
+  already been populated in a previous CMake run, that content will be reused
+  rather than repopulating them again.  For the common case where population
+  involves downloading content, the cost of the download is only paid once.
+
+  An internal global property records when a particular content population
+  request has been processed.  If ``FetchContent_Populate()`` is called more
+  than once for the same content name within a configure run, the second call
+  will halt with an error.  Projects can and should check whether content
+  population has already been processed with the
+  :command:`FetchContent_GetProperties` command before calling
+  ``FetchContent_Populate()``.
+
+  ``FetchContent_Populate()`` will set three variables in the scope of the
+  caller:
+
+  ``<lowercaseName>_POPULATED``
+    This will always be set to ``TRUE`` by the call.
+
+  ``<lowercaseName>_SOURCE_DIR``
+    The location where the populated content can be found upon return.
+
+  ``<lowercaseName>_BINARY_DIR``
+    A directory intended for use as a corresponding build directory.
+
+  The main use case for the ``<lowercaseName>_SOURCE_DIR`` and
+  ``<lowercaseName>_BINARY_DIR`` variables is to call
+  :command:`add_subdirectory` immediately after population:
+
+  .. code-block:: cmake
+
+    FetchContent_Populate(FooBar)
+    add_subdirectory(${foobar_SOURCE_DIR} ${foobar_BINARY_DIR})
+
+  The values of the three variables can also be retrieved from anywhere in the
+  project hierarchy using the :command:`FetchContent_GetProperties` command.
+
+  The ``FetchContent_Populate()`` command also supports a syntax allowing the
+  content details to be specified directly rather than using any saved
+  details.  This is more low-level and use of this form is generally to be
+  avoided in favor of using saved content details as outlined above.
+  Nevertheless, in certain situations it can be useful to invoke the content
+  population as an isolated operation (typically as part of implementing some
+  other higher level feature or when using CMake in script mode):
+
+  .. code-block:: cmake
+
+    FetchContent_Populate(
+      <name>
+      [QUIET]
+      [SUBBUILD_DIR <subBuildDir>]
+      [SOURCE_DIR <srcDir>]
+      [BINARY_DIR <binDir>]
+      ...
+    )
+
+  This form has a number of key differences to that where only ``<name>`` is
+  provided:
+
+  - All required population details are assumed to have been provided directly
+    in the call to ``FetchContent_Populate()``. Any saved details for
+    ``<name>`` are ignored.
+  - No check is made for whether content for ``<name>`` has already been
+    populated.
+  - No global property is set to record that the population has occurred.
+  - No global properties record the source or binary directories used for the
+    populated content.
+  - The ``FETCHCONTENT_FULLY_DISCONNECTED`` and
+    ``FETCHCONTENT_UPDATES_DISCONNECTED`` cache variables are ignored.
+
+  The ``<lowercaseName>_SOURCE_DIR`` and ``<lowercaseName>_BINARY_DIR``
+  variables are still returned to the caller, but since these locations are
+  not stored as global properties when this form is used, they are only
+  available to the calling scope and below rather than the entire project
+  hierarchy.  No ``<lowercaseName>_POPULATED`` variable is set in the caller's
+  scope with this form.
+
+  The supported options for ``FetchContent_Populate()`` are the same as those
+  for :command:`FetchContent_Declare()`.  Those few options shown just
+  above are either specific to ``FetchContent_Populate()`` or their behavior is
+  slightly modified from how :command:`ExternalProject_Add` treats them:
+
+  ``QUIET``
+    The ``QUIET`` option can be given to hide the output associated with
+    populating the specified content.  If the population fails, the output will
+    be shown regardless of whether this option was given or not so that the
+    cause of the failure can be diagnosed.  The global ``FETCHCONTENT_QUIET``
+    cache variable has no effect on ``FetchContent_Populate()`` calls where the
+    content details are provided directly.
+
+  ``SUBBUILD_DIR``
+    The ``SUBBUILD_DIR`` argument can be provided to change the location of the
+    sub-build created to perform the population.  The default value is
+    ``${CMAKE_CURRENT_BINARY_DIR}/<lowercaseName>-subbuild`` and it would be
+    unusual to need to override this default.  If a relative path is specified,
+    it will be interpreted as relative to :variable:`CMAKE_CURRENT_BINARY_DIR`.
+    This option should not be confused with the ``SOURCE_SUBDIR`` option which
+    only affects the :command:`FetchContent_MakeAvailable` command.
+
+  ``SOURCE_DIR``, ``BINARY_DIR``
+    The ``SOURCE_DIR`` and ``BINARY_DIR`` arguments are supported by
+    :command:`ExternalProject_Add`, but different default values are used by
+    ``FetchContent_Populate()``.  ``SOURCE_DIR`` defaults to
+    ``${CMAKE_CURRENT_BINARY_DIR}/<lowercaseName>-src`` and ``BINARY_DIR``
+    defaults to ``${CMAKE_CURRENT_BINARY_DIR}/<lowercaseName>-build``.
+    If a relative path is specified, it will be interpreted as relative to
+    :variable:`CMAKE_CURRENT_BINARY_DIR`.
+
+  In addition to the above explicit options, any other unrecognized options are
+  passed through unmodified to :command:`ExternalProject_Add` to perform the
+  download, patch and update steps.  The following options are explicitly
+  prohibited (they are disabled by the ``FetchContent_Populate()`` command):
+
+  - ``CONFIGURE_COMMAND``
+  - ``BUILD_COMMAND``
+  - ``INSTALL_COMMAND``
+  - ``TEST_COMMAND``
+
+  If using ``FetchContent_Populate()`` within CMake's script mode, be aware
+  that the implementation sets up a sub-build which therefore requires a CMake
+  generator and build tool to be available. If these cannot be found by
+  default, then the :variable:`CMAKE_GENERATOR` and/or
+  :variable:`CMAKE_MAKE_PROGRAM` variables will need to be set appropriately
+  on the command line invoking the script.
+
+  .. versionadded:: 3.18
+    Added support for the ``DOWNLOAD_NO_EXTRACT`` option.
+
+.. command:: FetchContent_GetProperties
+
+  When using saved content details, a call to
+  :command:`FetchContent_MakeAvailable` or :command:`FetchContent_Populate`
+  records information in global properties which can be queried at any time.
+  This information may include the source and binary directories associated with
+  the content and also whether or not the content population has been processed
+  during the current configure run.
+
+  .. code-block:: cmake
+
+    FetchContent_GetProperties(
+      <name>
+      [SOURCE_DIR <srcDirVar>]
+      [BINARY_DIR <binDirVar>]
+      [POPULATED <doneVar>]
+    )
+
+  The ``SOURCE_DIR``, ``BINARY_DIR`` and ``POPULATED`` options can be used to
+  specify which properties should be retrieved.  Each option accepts a value
+  which is the name of the variable in which to store that property.  Most of
+  the time though, only ``<name>`` is given, in which case the call will then
+  set the same variables as a call to
+  :command:`FetchContent_MakeAvailable(name) <FetchContent_MakeAvailable>` or
+  :command:`FetchContent_Populate(name) <FetchContent_Populate>`.
+  Note that the ``SOURCE_DIR`` and ``BINARY_DIR`` values can be empty if the
+  call is fulfilled by a :ref:`dependency provider <dependency_providers>`.
+
+  This command is rarely needed when using
+  :command:`FetchContent_MakeAvailable`.  It is more commonly used as part of
+  implementing the following pattern with :command:`FetchContent_Populate`,
+  which ensures that the relevant variables will always be defined regardless
+  of whether or not the population has been performed elsewhere in the project
+  already:
+
+  .. code-block:: cmake
+
+    # Check if population has already been performed
+    FetchContent_GetProperties(depname)
+    if(NOT depname_POPULATED)
+      # Fetch the content using previously declared details
+      FetchContent_Populate(depname)
+
+      # Set custom variables, policies, etc.
+      # ...
+
+      # Bring the populated content into the build
+      add_subdirectory(${depname_SOURCE_DIR} ${depname_BINARY_DIR})
+    endif()
+
+.. command:: FetchContent_SetPopulated
+
+  .. versionadded:: 3.24
+
+  .. note::
+    This command should only be called by
+    :ref:`dependency providers <dependency_providers>`.  Calling it in any
+    other context is unsupported and future CMake versions may halt with a
+    fatal error in such cases.
+
+  .. code-block:: cmake
+
+    FetchContent_SetPopulated(
+      <name>
+      [SOURCE_DIR <srcDir>]
+      [BINARY_DIR <binDir>]
+    )
+
+  If a provider command fulfills a ``FETCHCONTENT_MAKEAVAILABLE_SERIAL``
+  request, it must call this function before returning.  The ``SOURCE_DIR``
+  and ``BINARY_DIR`` arguments can be used to specify the values that
+  :command:`FetchContent_GetProperties` should return for its corresponding
+  arguments.  Only provide ``SOURCE_DIR`` and ``BINARY_DIR`` if they have
+  the same meaning as if they had been populated by the built-in
+  :command:`FetchContent_MakeAvailable` implementation.
+
+
+Variables
+^^^^^^^^^
+
+A number of cache variables can influence the behavior where details from a
+:command:`FetchContent_Declare` call are used to populate content.
+
+.. note::
+  All of these variables are intended for the developer to customize behavior.
+  They should not normally be set by the project.
+
+.. variable:: FETCHCONTENT_BASE_DIR
+
+  In most cases, the saved details do not specify any options relating to the
+  directories to use for the internal sub-build, final source and build areas.
+  It is generally best to leave these decisions up to the ``FetchContent``
+  module to handle on the project's behalf.  The ``FETCHCONTENT_BASE_DIR``
+  cache variable controls the point under which all content population
+  directories are collected, but in most cases, developers would not need to
+  change this.  The default location is ``${CMAKE_BINARY_DIR}/_deps``, but if
+  developers change this value, they should aim to keep the path short and
+  just below the top level of the build tree to avoid running into path
+  length problems on Windows.
+
+.. variable:: FETCHCONTENT_QUIET
+
+  The logging output during population can be quite verbose, making the
+  configure stage quite noisy.  This cache option (``ON`` by default) hides
+  all population output unless an error is encountered.  If experiencing
+  problems with hung downloads, temporarily switching this option off may
+  help diagnose which content population is causing the issue.
+
+.. variable:: FETCHCONTENT_FULLY_DISCONNECTED
+
+  When this option is enabled, no attempt is made to download or update
+  any content.  It is assumed that all content has already been populated in
+  a previous run or the source directories have been pointed at existing
+  contents the developer has provided manually (using options described
+  further below).  When the developer knows that no changes have been made to
+  any content details, turning this option ``ON`` can significantly speed up
+  the configure stage.  It is ``OFF`` by default.
+
+.. variable:: FETCHCONTENT_UPDATES_DISCONNECTED
+
+  This is a less severe download/update control compared to
+  :variable:`FETCHCONTENT_FULLY_DISCONNECTED`.  Instead of bypassing all
+  download and update logic, ``FETCHCONTENT_UPDATES_DISCONNECTED`` only
+  disables the update stage.  Therefore, if content has not been downloaded
+  previously, it will still be downloaded when this option is enabled.
+  This can speed up the configure stage, but not as much as
+  :variable:`FETCHCONTENT_FULLY_DISCONNECTED`.  It is ``OFF`` by default.
+
+.. variable:: FETCHCONTENT_TRY_FIND_PACKAGE_MODE
+
+  .. versionadded:: 3.24
+
+  This variable modifies the details that :command:`FetchContent_Declare`
+  records for a given dependency.  While it ultimately controls the behavior
+  of :command:`FetchContent_MakeAvailable`, it is the variable's value when
+  :command:`FetchContent_Declare` is called that gets used.  It makes no
+  difference what the variable is set to when
+  :command:`FetchContent_MakeAvailable` is called.  Since the variable should
+  only be set by the user and not by projects directly, it will typically have
+  the same value throughout anyway, so this distinction is not usually
+  noticeable.
+
+  ``FETCHCONTENT_TRY_FIND_PACKAGE_MODE`` ultimately controls whether
+  :command:`FetchContent_MakeAvailable` is allowed to call
+  :command:`find_package` to satisfy a dependency.  The variable can be set
+  to one of the following values:
+
+  ``OPT_IN``
+    :command:`FetchContent_MakeAvailable` will only call
+    :command:`find_package` if the :command:`FetchContent_Declare` call
+    included a ``FIND_PACKAGE_ARGS`` keyword.  This is also the default
+    behavior if ``FETCHCONTENT_TRY_FIND_PACKAGE_MODE`` is not set.
+
+  ``ALWAYS``
+    :command:`find_package` can be called by
+    :command:`FetchContent_MakeAvailable` regardless of whether the
+    :command:`FetchContent_Declare` call included a ``FIND_PACKAGE_ARGS``
+    keyword or not.  If no ``FIND_PACKAGE_ARGS`` keyword was given, the
+    behavior will be as though ``FIND_PACKAGE_ARGS`` had been provided,
+    with no additional arguments after it.
+
+  ``NEVER``
+    :command:`FetchContent_MakeAvailable` will not call
+    :command:`find_package`.  Any ``FIND_PACKAGE_ARGS`` given to the
+    :command:`FetchContent_Declare` call will be ignored.
+
+  As a special case, if the :variable:`FETCHCONTENT_SOURCE_DIR_<uppercaseName>`
+  variable has a non-empty value for a dependency, it is assumed that the
+  user is overriding all other methods of making that dependency available.
+  ``FETCHCONTENT_TRY_FIND_PACKAGE_MODE`` will have no effect on that
+  dependency and :command:`FetchContent_MakeAvailable` will not try to call
+  :command:`find_package` for it.
+
+In addition to the above, the following variables are also defined for each
+content name:
+
+.. variable:: FETCHCONTENT_SOURCE_DIR_<uppercaseName>
+
+  If this is set, no download or update steps are performed for the specified
+  content and the ``<lowercaseName>_SOURCE_DIR`` variable returned to the
+  caller is pointed at this location.  This gives developers a way to have a
+  separate checkout of the content that they can modify freely without
+  interference from the build.  The build simply uses that existing source,
+  but it still defines ``<lowercaseName>_BINARY_DIR`` to point inside its own
+  build area.  Developers are strongly encouraged to use this mechanism rather
+  than editing the sources populated in the default location, as changes to
+  sources in the default location can be lost when content population details
+  are changed by the project.
+
+.. variable:: FETCHCONTENT_UPDATES_DISCONNECTED_<uppercaseName>
+
+  This is the per-content equivalent of
+  :variable:`FETCHCONTENT_UPDATES_DISCONNECTED`.  If the global option or
+  this option is ``ON``, then updates will be disabled for the named content.
+  Disabling updates for individual content can be useful for content whose
+  details rarely change, while still leaving other frequently changing content
+  with updates enabled.
+
+.. _`fetch-content-examples`:
+
+Examples
+^^^^^^^^
+
+Typical Case
+""""""""""""
+
+This first fairly straightforward example ensures that some popular testing
+frameworks are available to the main build:
+
+.. code-block:: cmake
+
+  include(FetchContent)
+  FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
+  )
+  FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4
+  )
+
+  # After the following call, the CMake targets defined by googletest and
+  # Catch2 will be available to the rest of the build
+  FetchContent_MakeAvailable(googletest Catch2)
+
+.. _FetchContent-find_package-integration-examples:
+
+Integrating With find_package()
+"""""""""""""""""""""""""""""""
+
+For the previous example, if the user wanted to try to find ``googletest``
+and ``Catch2`` via :command:`find_package` first before trying to download
+and build them from source, they could set the
+:variable:`FETCHCONTENT_TRY_FIND_PACKAGE_MODE` variable to ``ALWAYS``.
+This would also affect any other calls to :command:`FetchContent_Declare`
+throughout the project, which might not be acceptable.  The behavior can be
+enabled for just these two dependencies instead by adding ``FIND_PACKAGE_ARGS``
+to the declared details and leaving
+:variable:`FETCHCONTENT_TRY_FIND_PACKAGE_MODE` unset, or set to ``OPT_IN``:
+
+.. code-block:: cmake
+
+  include(FetchContent)
+  FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
+    FIND_PACKAGE_ARGS NAMES GTest
+  )
+  FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4
+    FIND_PACKAGE_ARGS
+  )
+
+  # This will try calling find_package() first for both dependencies
+  FetchContent_MakeAvailable(googletest Catch2)
+
+For ``Catch2``, no additional arguments to :command:`find_package` are needed,
+so no additional arguments are provided after the ``FIND_PACKAGE_ARGS``
+keyword.  For ``googletest``, its package is more commonly called ``GTest``,
+so arguments are added to support it being found by that name.
+
+If the user wanted to disable :command:`FetchContent_MakeAvailable` from
+calling :command:`find_package` for any dependency, even if it provided
+``FIND_PACKAGE_ARGS`` in its declared details, they could set
+:variable:`FETCHCONTENT_TRY_FIND_PACKAGE_MODE` to ``NEVER``.
+
+If the project wanted to indicate that these two dependencies should be
+downloaded and built from source and that :command:`find_package` calls
+should be redirected to use the built dependencies, the
+``OVERRIDE_FIND_PACKAGE`` option should be used when declaring the content
+details:
+
+.. code-block:: cmake
+
+  include(FetchContent)
+  FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG        703bd9caab50b139428cea1aaff9974ebee5742e # release-1.10.0
+    OVERRIDE_FIND_PACKAGE
+  )
+  FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad # v2.13.4
+    OVERRIDE_FIND_PACKAGE
+  )
+
+  # The following will automatically forward through to FetchContent_MakeAvailable()
+  find_package(googletest)
+  find_package(Catch2)
+
+CMake provides a FindGTest module which defines some variables that older
+projects may use instead of linking to the imported targets.  To support
+those cases, we can provide an extra file.  In keeping with the
+"first to define, wins" philosophy of ``FetchContent``, we only write out
+that file if something else hasn't already done so.
+
+.. code-block:: cmake
+
+  FetchContent_MakeAvailable(googletest)
+
+  if(NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletest-extra.cmake AND
+     NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletestExtra.cmake)
+    file(WRITE ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletest-extra.cmake
+  [=[
+  if("${GTEST_LIBRARIES}" STREQUAL "" AND TARGET GTest::gtest)
+    set(GTEST_LIBRARIES GTest::gtest)
+  endif()
+  if("${GTEST_MAIN_LIBRARIES}" STREQUAL "" AND TARGET GTest::gtest_main)
+    set(GTEST_MAIN_LIBRARIES GTest::gtest_main)
+  endif()
+  if("${GTEST_BOTH_LIBRARIES}" STREQUAL "")
+    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+  endif()
+  ]=])
+  endif()
+
+Projects will also likely be using ``find_package(GTest)`` rather than
+``find_package(googletest)``, but it is possible to make use of the
+:variable:`CMAKE_FIND_PACKAGE_REDIRECTS_DIR` area to pull in the latter as
+a dependency of the former.  This is likely to be sufficient to satisfy
+a typical ``find_package(GTest)`` call.
+
+.. code-block:: cmake
+
+  FetchContent_MakeAvailable(googletest)
+
+  if(NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/gtest-config.cmake AND
+     NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/GTestConfig.cmake)
+    file(WRITE ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/gtest-config.cmake
+  [=[
+  include(CMakeFindDependencyMacro)
+  find_dependency(googletest)
+  ]=])
+  endif()
+
+  if(NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/gtest-config-version.cmake AND
+     NOT EXISTS ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/GTestConfigVersion.cmake)
+    file(WRITE ${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/gtest-config-version.cmake
+  [=[
+  include(${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletest-config-version.cmake OPTIONAL)
+  if(NOT PACKAGE_VERSION_COMPATIBLE)
+    include(${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/googletestConfigVersion.cmake OPTIONAL)
+  endif()
+  ]=])
+  endif()
+
+Overriding Where To Find CMakeLists.txt
+"""""""""""""""""""""""""""""""""""""""
+
+If the sub-project's ``CMakeLists.txt`` file is not at the top level of its
+source tree, the ``SOURCE_SUBDIR`` option can be used to tell ``FetchContent``
+where to find it.  The following example shows how to use that option, and
+it also sets a variable which is meaningful to the subproject before pulling
+it into the main build (set as an ``INTERNAL`` cache variable to avoid
+problems with policy :policy:`CMP0077`):
+
+.. code-block:: cmake
+
+  include(FetchContent)
+  FetchContent_Declare(
+    protobuf
+    GIT_REPOSITORY https://github.com/protocolbuffers/protobuf.git
+    GIT_TAG        ae50d9b9902526efd6c7a1907d09739f959c6297 # v3.15.0
+    SOURCE_SUBDIR  cmake
+  )
+  set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "")
+  FetchContent_MakeAvailable(protobuf)
+
+Complex Dependency Hierarchies
+""""""""""""""""""""""""""""""
+
+In more complex project hierarchies, the dependency relationships can be more
+complicated.  Consider a hierarchy where ``projA`` is the top level project and
+it depends directly on projects ``projB`` and ``projC``.  Both ``projB`` and
+``projC`` can be built standalone and they also both depend on another project
+``projD``.  ``projB`` additionally depends on ``projE``.  This example assumes
+that all five projects are available on a company git server.  The
+``CMakeLists.txt`` of each project might have sections like the following:
+
+*projA*:
+
+.. code-block:: cmake
+
+  include(FetchContent)
+  FetchContent_Declare(
+    projB
+    GIT_REPOSITORY git@mycompany.com:git/projB.git
+    GIT_TAG        4a89dc7e24ff212a7b5167bef7ab079d
+  )
+  FetchContent_Declare(
+    projC
+    GIT_REPOSITORY git@mycompany.com:git/projC.git
+    GIT_TAG        4ad4016bd1d8d5412d135cf8ceea1bb9
+  )
+  FetchContent_Declare(
+    projD
+    GIT_REPOSITORY git@mycompany.com:git/projD.git
+    GIT_TAG        origin/integrationBranch
+  )
+  FetchContent_Declare(
+    projE
+    GIT_REPOSITORY git@mycompany.com:git/projE.git
+    GIT_TAG        v2.3-rc1
+  )
+
+  # Order is important, see notes in the discussion further below
+  FetchContent_MakeAvailable(projD projB projC)
+
+*projB*:
+
+.. code-block:: cmake
+
+  include(FetchContent)
+  FetchContent_Declare(
+    projD
+    GIT_REPOSITORY git@mycompany.com:git/projD.git
+    GIT_TAG        20b415f9034bbd2a2e8216e9a5c9e632
+  )
+  FetchContent_Declare(
+    projE
+    GIT_REPOSITORY git@mycompany.com:git/projE.git
+    GIT_TAG        68e20f674a48be38d60e129f600faf7d
+  )
+
+  FetchContent_MakeAvailable(projD projE)
+
+*projC*:
+
+.. code-block:: cmake
+
+  include(FetchContent)
+  FetchContent_Declare(
+    projD
+    GIT_REPOSITORY git@mycompany.com:git/projD.git
+    GIT_TAG        7d9a17ad2c962aa13e2fbb8043fb6b8a
+  )
+
+  # This particular version of projD requires workarounds
+  FetchContent_GetProperties(projD)
+  if(NOT projd_POPULATED)
+    FetchContent_Populate(projD)
+
+    # Copy an additional/replacement file into the populated source
+    file(COPY someFile.c DESTINATION ${projd_SOURCE_DIR}/src)
+
+    add_subdirectory(${projd_SOURCE_DIR} ${projd_BINARY_DIR})
+  endif()
+
+A few key points should be noted in the above:
+
+- ``projB`` and ``projC`` define different content details for ``projD``,
+  but ``projA`` also defines a set of content details for ``projD``.
+  Because ``projA`` will define them first, the details from ``projB`` and
+  ``projC`` will not be used.  The override details defined by ``projA``
+  are not required to match either of those from ``projB`` or ``projC``, but
+  it is up to the higher level project to ensure that the details it does
+  define still make sense for the child projects.
+- In the ``projA`` call to :command:`FetchContent_MakeAvailable`, ``projD``
+  is listed ahead of ``projB`` and ``projC`` to ensure that ``projA`` is in
+  control of how ``projD`` is populated.
+- While ``projA`` defines content details for ``projE``, it does not need
+  to explicitly call ``FetchContent_MakeAvailable(projE)`` or
+  ``FetchContent_Populate(projD)`` itself.  Instead, it leaves that to the
+  child ``projB``.  For higher level projects, it is often enough to just
+  define the override content details and leave the actual population to the
+  child projects.  This saves repeating the same thing at each level of the
+  project hierarchy unnecessarily.
+
+Populating Content Without Adding It To The Build
+"""""""""""""""""""""""""""""""""""""""""""""""""
+
+Projects don't always need to add the populated content to the build.
+Sometimes the project just wants to make the downloaded content available at
+a predictable location.  The next example ensures that a set of standard
+company toolchain files (and potentially even the toolchain binaries
+themselves) is available early enough to be used for that same build.
+
+.. code-block:: cmake
+
+  cmake_minimum_required(VERSION 3.14)
+
+  include(FetchContent)
+  FetchContent_Declare(
+    mycom_toolchains
+    URL  https://intranet.mycompany.com//toolchains_1.3.2.tar.gz
+  )
+  FetchContent_MakeAvailable(mycom_toolchains)
+
+  project(CrossCompileExample)
+
+The project could be configured to use one of the downloaded toolchains like
+so:
+
+.. code-block:: shell
+
+  cmake -DCMAKE_TOOLCHAIN_FILE=_deps/mycom_toolchains-src/toolchain_arm.cmake /path/to/src
+
+When CMake processes the ``CMakeLists.txt`` file, it will download and unpack
+the tarball into ``_deps/mycompany_toolchains-src`` relative to the build
+directory.  The :variable:`CMAKE_TOOLCHAIN_FILE` variable is not used until
+the :command:`project` command is reached, at which point CMake looks for the
+named toolchain file relative to the build directory.  Because the tarball has
+already been downloaded and unpacked by then, the toolchain file will be in
+place, even the very first time that ``cmake`` is run in the build directory.
+
+Populating Content In CMake Script Mode
+"""""""""""""""""""""""""""""""""""""""
+
+This last example demonstrates how one might download and unpack a
+firmware tarball using CMake's :manual:`script mode <cmake(1)>`.  The call to
+:command:`FetchContent_Populate` specifies all the content details and the
+unpacked firmware will be placed in a ``firmware`` directory below the
+current working directory.
+
+*getFirmware.cmake*:
+
+.. code-block:: cmake
+
+  # NOTE: Intended to be run in script mode with cmake -P
+  include(FetchContent)
+  FetchContent_Populate(
+    firmware
+    URL        https://mycompany.com/assets/firmware-1.23-arm.tar.gz
+    URL_HASH   MD5=68247684da89b608d466253762b0ff11
+    SOURCE_DIR firmware
+  )
+
+#]=======================================================================]
+
+#=======================================================================
+# Recording and retrieving content details for later population
+#=======================================================================
+
+# Internal use, projects must not call this directly. It is
+# intended for use by FetchContent_Declare() only.
+#
+# Sets a content-specific global property (not meant for use
+# outside of functions defined here in this file) which can later
+# be retrieved using __FetchContent_getSavedDetails() with just the
+# same content name. If there is already a value stored in the
+# property, it is left unchanged and this call has no effect.
+# This allows parent projects to define the content details,
+# overriding anything a child project may try to set (properties
+# are not cached between runs, so the first thing to set it in a
+# build will be in control).
+function(__FetchContent_declareDetails contentName)
+
+  string(TOLOWER ${contentName} contentNameLower)
+  set(savedDetailsPropertyName "_FetchContent_${contentNameLower}_savedDetails")
+  get_property(alreadyDefined GLOBAL PROPERTY ${savedDetailsPropertyName} DEFINED)
+  if(alreadyDefined)
+    return()
+  endif()
+
+  if("${FETCHCONTENT_TRY_FIND_PACKAGE_MODE}" STREQUAL "ALWAYS")
+    set(__tryFindPackage TRUE)
+    set(__tryFindPackageAllowed TRUE)
+  elseif("${FETCHCONTENT_TRY_FIND_PACKAGE_MODE}" STREQUAL "NEVER")
+    set(__tryFindPackage FALSE)
+    set(__tryFindPackageAllowed FALSE)
+  elseif("${FETCHCONTENT_TRY_FIND_PACKAGE_MODE}" STREQUAL "OPT_IN" OR
+         NOT DEFINED FETCHCONTENT_TRY_FIND_PACKAGE_MODE)
+    set(__tryFindPackage FALSE)
+    set(__tryFindPackageAllowed TRUE)
+  else()
+    message(FATAL_ERROR
+      "Unsupported value for FETCHCONTENT_TRY_FIND_PACKAGE_MODE: "
+      "${FETCHCONTENT_TRY_FIND_PACKAGE_MODE}"
+    )
+  endif()
+
+  set(__cmdArgs)
+  set(__findPackageArgs)
+  set(__sawQuietKeyword NO)
+  set(__sawGlobalKeyword NO)
+  foreach(__item IN LISTS ARGN)
+    if(DEFINED __findPackageArgs)
+      # All remaining args are for find_package()
+      string(APPEND __findPackageArgs " [==[${__item}]==]")
+      if(__item STREQUAL "QUIET")
+        set(__sawQuietKeyword YES)
+      elseif(__item STREQUAL "GLOBAL")
+        set(__sawGlobalKeyword YES)
+      endif()
+      continue()
+    endif()
+
+    # Still processing non-find_package() args
+    if(__item STREQUAL "FIND_PACKAGE_ARGS")
+      if(__tryFindPackageAllowed)
+        set(__tryFindPackage TRUE)
+      endif()
+      # All arguments after this keyword are for find_package(). Define the
+      # variable but with an empty value initially. This allows us to check
+      # at the start of the loop whether to store remaining items in this
+      # variable or not. Note that there could be no more args, which is still
+      # a valid case because we automatically provide ${contentName} as the
+      # package name and there may not need to be any further arguments.
+      set(__findPackageArgs "")
+      continue()  # Don't store this item
+    elseif(__item STREQUAL "OVERRIDE_FIND_PACKAGE")
+      set(__tryFindPackageAllowed FALSE)
+      # Define a separate dedicated property for find_package() to check
+      # in its implementation. This will be a placeholder until FetchContent
+      # actually does the population. After that, we will have created a
+      # stand-in config file that find_package() will pick up instead.
+      set(propertyName "_FetchContent_${contentNameLower}_override_find_package")
+      define_property(GLOBAL PROPERTY ${propertyName})
+      set_property(GLOBAL PROPERTY ${propertyName} TRUE)
+    endif()
+
+    string(APPEND __cmdArgs " [==[${__item}]==]")
+  endforeach()
+
+  define_property(GLOBAL PROPERTY ${savedDetailsPropertyName})
+  cmake_language(EVAL CODE
+    "set_property(GLOBAL PROPERTY ${savedDetailsPropertyName} ${__cmdArgs})"
+  )
+
+  if(__tryFindPackage AND __tryFindPackageAllowed)
+    set(propertyName "_FetchContent_${contentNameLower}_find_package_args")
+    define_property(GLOBAL PROPERTY ${propertyName})
+    if(NOT __sawQuietKeyword)
+      list(INSERT __findPackageArgs 0 QUIET)
+    endif()
+    if(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL AND NOT __sawGlobalKeyword)
+      list(APPEND __findPackageArgs GLOBAL)
+    endif()
+    cmake_language(EVAL CODE
+      "set_property(GLOBAL PROPERTY ${propertyName} ${__findPackageArgs})"
+    )
+  endif()
+
+endfunction()
+
+
+# Internal use, projects must not call this directly. It is
+# intended for use by the FetchContent_Declare() function.
+#
+# Retrieves details saved for the specified content in an
+# earlier call to __FetchContent_declareDetails().
+function(__FetchContent_getSavedDetails contentName outVar)
+
+  string(TOLOWER ${contentName} contentNameLower)
+  set(propertyName "_FetchContent_${contentNameLower}_savedDetails")
+  get_property(alreadyDefined GLOBAL PROPERTY ${propertyName} DEFINED)
+  if(NOT alreadyDefined)
+    message(FATAL_ERROR "No content details recorded for ${contentName}")
+  endif()
+  get_property(propertyValue GLOBAL PROPERTY ${propertyName})
+  set(${outVar} "${propertyValue}" PARENT_SCOPE)
+
+endfunction()
+
+
+# Saves population details of the content, sets defaults for the
+# SOURCE_DIR and BUILD_DIR.
+function(FetchContent_Declare contentName)
+
+  # Always check this even if we won't save these details.
+  # This helps projects catch errors earlier.
+  # Avoid using if(... IN_LIST ...) so we don't have to alter policy settings
+  list(FIND ARGN OVERRIDE_FIND_PACKAGE index_OVERRIDE_FIND_PACKAGE)
+  list(FIND ARGN FIND_PACKAGE_ARGS index_FIND_PACKAGE_ARGS)
+  if(index_OVERRIDE_FIND_PACKAGE GREATER_EQUAL 0 AND
+     index_FIND_PACKAGE_ARGS GREATER_EQUAL 0)
+    message(FATAL_ERROR
+      "Cannot specify both OVERRIDE_FIND_PACKAGE and FIND_PACKAGE_ARGS "
+      "when declaring details for ${contentName}"
+    )
+  endif()
+
+  # Because we are only looking for a subset of the supported keywords, we
+  # cannot check for multi-value arguments with this method. We will have to
+  # handle the URL keyword differently.
+  set(oneValueArgs
+    SVN_REPOSITORY
+    DOWNLOAD_NO_EXTRACT
+    DOWNLOAD_EXTRACT_TIMESTAMP
+    BINARY_DIR
+    SOURCE_DIR
+  )
+
+  cmake_parse_arguments(PARSE_ARGV 1 ARG "" "${oneValueArgs}" "")
+
+  string(TOLOWER ${contentName} contentNameLower)
+
+  if(NOT ARG_BINARY_DIR)
+    set(ARG_BINARY_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build")
+  endif()
+
+  if(NOT ARG_SOURCE_DIR)
+    set(ARG_SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-src")
+  endif()
+
+  if(ARG_SVN_REPOSITORY)
+    # Add a hash of the svn repository URL to the source dir. This works
+    # around the problem where if the URL changes, the download would
+    # fail because it tries to checkout/update rather than switch the
+    # old URL to the new one. We limit the hash to the first 7 characters
+    # so that the source path doesn't get overly long (which can be a
+    # problem on windows due to path length limits).
+    string(SHA1 urlSHA ${ARG_SVN_REPOSITORY})
+    string(SUBSTRING ${urlSHA} 0 7 urlSHA)
+    string(APPEND ARG_SOURCE_DIR "-${urlSHA}")
+  endif()
+
+  # The ExternalProject_Add() call in the sub-build won't see the CMP0135
+  # policy setting of our caller. Work out if that policy will be needed and
+  # explicitly set the relevant option if not already provided. The condition
+  # here is essentially an abbreviated version of the logic in
+  # ExternalProject's _ep_add_download_command() function.
+  if(NOT ARG_DOWNLOAD_NO_EXTRACT AND
+     NOT DEFINED ARG_DOWNLOAD_EXTRACT_TIMESTAMP)
+    list(FIND ARGN URL urlIndex)
+    if(urlIndex GREATER_EQUAL 0)
+      math(EXPR urlIndex "${urlIndex} + 1")
+      list(LENGTH ARGN numArgs)
+      if(urlIndex GREATER_EQUAL numArgs)
+        message(FATAL_ERROR
+          "URL keyword needs to be followed by at least one URL"
+        )
+      endif()
+      # If we have multiple URLs, none of them are allowed to be local paths.
+      # Therefore, we can test just the first URL, and if it is non-local, so
+      # will be the others if there are more.
+      list(GET ARGN ${urlIndex} firstUrl)
+      if(NOT IS_DIRECTORY "${firstUrl}")
+        cmake_policy(GET CMP0135 _FETCHCONTENT_CMP0135
+          PARENT_SCOPE # undocumented, do not use outside of CMake
+        )
+        if(_FETCHCONTENT_CMP0135 STREQUAL "")
+          message(AUTHOR_WARNING
+            "The DOWNLOAD_EXTRACT_TIMESTAMP option was not given and policy "
+            "CMP0135 is not set. The policy's OLD behavior will be used. "
+            "When using a URL download, the timestamps of extracted files "
+            "should preferably be that of the time of extraction, otherwise "
+            "code that depends on the extracted contents might not be "
+            "rebuilt if the URL changes. The OLD behavior preserves the "
+            "timestamps from the archive instead, but this is usually not "
+            "what you want. Update your project to the NEW behavior or "
+            "specify the DOWNLOAD_EXTRACT_TIMESTAMP option with a value of "
+            "true to avoid this robustness issue."
+          )
+          set(ARG_DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
+        elseif(_FETCHCONTENT_CMP0135 STREQUAL "NEW")
+          set(ARG_DOWNLOAD_EXTRACT_TIMESTAMP FALSE)
+        else()
+          set(ARG_DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
+        endif()
+      endif()
+    endif()
+  endif()
+
+  # Add back in the keyword args we pulled out and potentially tweaked/added
+  foreach(key IN LISTS oneValueArgs)
+    if(DEFINED ARG_${key})
+      list(PREPEND ARG_UNPARSED_ARGUMENTS ${key} "${ARG_${key}}")
+    endif()
+  endforeach()
+
+  set(__argsQuoted)
+  foreach(__item IN LISTS ARG_UNPARSED_ARGUMENTS)
+    string(APPEND __argsQuoted " [==[${__item}]==]")
+  endforeach()
+  cmake_language(EVAL CODE
+    "__FetchContent_declareDetails(${contentNameLower} ${__argsQuoted})"
+  )
+
+endfunction()
+
+
+#=======================================================================
+# Set/get whether the specified content has been populated yet.
+# The setter also records the source and binary dirs used.
+#=======================================================================
+
+# Semi-internal use. Projects must not call this directly. Dependency
+# providers must call it if they satisfy a request made with the
+# FETCHCONTENT_MAKEAVAILABLE_SERIAL method (that is the only permitted
+# place to call it outside of the FetchContent module).
+function(FetchContent_SetPopulated contentName)
+
+  cmake_parse_arguments(PARSE_ARGV 1 arg
+    ""
+    "SOURCE_DIR;BINARY_DIR"
+    ""
+  )
+  if(NOT "${arg_UNPARSED_ARGUMENTS}" STREQUAL "")
+    message(FATAL_ERROR "Unsupported arguments: ${arg_UNPARSED_ARGUMENTS}")
+  endif()
+
+  string(TOLOWER ${contentName} contentNameLower)
+  set(prefix "_FetchContent_${contentNameLower}")
+
+  set(propertyName "${prefix}_sourceDir")
+  define_property(GLOBAL PROPERTY ${propertyName})
+  if("${arg_SOURCE_DIR}" STREQUAL "")
+    # Don't discard a previously provided SOURCE_DIR
+    get_property(arg_SOURCE_DIR GLOBAL PROPERTY ${propertyName})
+  endif()
+  set_property(GLOBAL PROPERTY ${propertyName} "${arg_SOURCE_DIR}")
+
+  set(propertyName "${prefix}_binaryDir")
+  define_property(GLOBAL PROPERTY ${propertyName})
+  if("${arg_BINARY_DIR}" STREQUAL "")
+    # Don't discard a previously provided BINARY_DIR
+    get_property(arg_BINARY_DIR GLOBAL PROPERTY ${propertyName})
+  endif()
+  set_property(GLOBAL PROPERTY ${propertyName} "${arg_BINARY_DIR}")
+
+  set(propertyName "${prefix}_populated")
+  define_property(GLOBAL PROPERTY ${propertyName})
+  set_property(GLOBAL PROPERTY ${propertyName} TRUE)
+
+endfunction()
+
+
+# Set variables in the calling scope for any of the retrievable
+# properties. If no specific properties are requested, variables
+# will be set for all retrievable properties.
+#
+# This function is intended to also be used by projects as the canonical
+# way to detect whether they should call FetchContent_Populate()
+# and pull the populated source into the build with add_subdirectory(),
+# if they are using the populated content in that way.
+function(FetchContent_GetProperties contentName)
+
+  string(TOLOWER ${contentName} contentNameLower)
+
+  set(options "")
+  set(oneValueArgs SOURCE_DIR BINARY_DIR POPULATED)
+  set(multiValueArgs "")
+
+  cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(NOT ARG_SOURCE_DIR AND
+     NOT ARG_BINARY_DIR AND
+     NOT ARG_POPULATED)
+    # No specific properties requested, provide them all
+    set(ARG_SOURCE_DIR ${contentNameLower}_SOURCE_DIR)
+    set(ARG_BINARY_DIR ${contentNameLower}_BINARY_DIR)
+    set(ARG_POPULATED  ${contentNameLower}_POPULATED)
+  endif()
+
+  set(prefix "_FetchContent_${contentNameLower}")
+
+  if(ARG_SOURCE_DIR)
+    set(propertyName "${prefix}_sourceDir")
+    get_property(value GLOBAL PROPERTY ${propertyName})
+    if(value)
+      set(${ARG_SOURCE_DIR} ${value} PARENT_SCOPE)
+    endif()
+  endif()
+
+  if(ARG_BINARY_DIR)
+    set(propertyName "${prefix}_binaryDir")
+    get_property(value GLOBAL PROPERTY ${propertyName})
+    if(value)
+      set(${ARG_BINARY_DIR} ${value} PARENT_SCOPE)
+    endif()
+  endif()
+
+  if(ARG_POPULATED)
+    set(propertyName "${prefix}_populated")
+    get_property(value GLOBAL PROPERTY ${propertyName} DEFINED)
+    set(${ARG_POPULATED} ${value} PARENT_SCOPE)
+  endif()
+
+endfunction()
+
+
+#=======================================================================
+# Performing the population
+#=======================================================================
+
+# The value of contentName will always have been lowercased by the caller.
+# All other arguments are assumed to be options that are understood by
+# ExternalProject_Add(), except for QUIET and SUBBUILD_DIR.
+function(__FetchContent_directPopulate contentName)
+
+  set(options
+      QUIET
+  )
+  set(oneValueArgs
+      SUBBUILD_DIR
+      SOURCE_DIR
+      BINARY_DIR
+      # We need special processing if DOWNLOAD_NO_EXTRACT is true
+      DOWNLOAD_NO_EXTRACT
+      # Prevent the following from being passed through
+      CONFIGURE_COMMAND
+      BUILD_COMMAND
+      INSTALL_COMMAND
+      TEST_COMMAND
+      # We force these to be ON since we are always executing serially
+      # and we want all steps to have access to the terminal in case they
+      # need input from the command line (e.g. ask for a private key password)
+      # or they want to provide timely progress. We silently absorb and
+      # discard these if they are set by the caller.
+      USES_TERMINAL_DOWNLOAD
+      USES_TERMINAL_UPDATE
+      USES_TERMINAL_PATCH
+  )
+  set(multiValueArgs "")
+
+  cmake_parse_arguments(PARSE_ARGV 1 ARG
+    "${options}" "${oneValueArgs}" "${multiValueArgs}")
+
+  if(NOT ARG_SUBBUILD_DIR)
+    message(FATAL_ERROR "Internal error: SUBBUILD_DIR not set")
+  elseif(NOT IS_ABSOLUTE "${ARG_SUBBUILD_DIR}")
+    set(ARG_SUBBUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${ARG_SUBBUILD_DIR}")
+  endif()
+
+  if(NOT ARG_SOURCE_DIR)
+    message(FATAL_ERROR "Internal error: SOURCE_DIR not set")
+  elseif(NOT IS_ABSOLUTE "${ARG_SOURCE_DIR}")
+    set(ARG_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/${ARG_SOURCE_DIR}")
+  endif()
+
+  if(NOT ARG_BINARY_DIR)
+    message(FATAL_ERROR "Internal error: BINARY_DIR not set")
+  elseif(NOT IS_ABSOLUTE "${ARG_BINARY_DIR}")
+    set(ARG_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/${ARG_BINARY_DIR}")
+  endif()
+
+  # Ensure the caller can know where to find the source and build directories
+  # with some convenient variables. Doing this here ensures the caller sees
+  # the correct result in the case where the default values are overridden by
+  # the content details set by the project.
+  set(${contentName}_SOURCE_DIR "${ARG_SOURCE_DIR}" PARENT_SCOPE)
+  set(${contentName}_BINARY_DIR "${ARG_BINARY_DIR}" PARENT_SCOPE)
+
+  # The unparsed arguments may contain spaces, so build up ARG_EXTRA
+  # in such a way that it correctly substitutes into the generated
+  # CMakeLists.txt file with each argument quoted.
+  unset(ARG_EXTRA)
+  foreach(arg IN LISTS ARG_UNPARSED_ARGUMENTS)
+    set(ARG_EXTRA "${ARG_EXTRA} \"${arg}\"")
+  endforeach()
+
+  if(ARG_DOWNLOAD_NO_EXTRACT)
+    set(ARG_EXTRA "${ARG_EXTRA} DOWNLOAD_NO_EXTRACT YES")
+    set(__FETCHCONTENT_COPY_FILE
+"
+ExternalProject_Get_Property(${contentName}-populate DOWNLOADED_FILE)
+get_filename_component(dlFileName \"\${DOWNLOADED_FILE}\" NAME)
+
+ExternalProject_Add_Step(${contentName}-populate copyfile
+  COMMAND    \"${CMAKE_COMMAND}\" -E copy_if_different
+             \"<DOWNLOADED_FILE>\" \"${ARG_SOURCE_DIR}\"
+  DEPENDEES  patch
+  DEPENDERS  configure
+  BYPRODUCTS \"${ARG_SOURCE_DIR}/\${dlFileName}\"
+  COMMENT    \"Copying file to SOURCE_DIR\"
+)
+")
+  else()
+    unset(__FETCHCONTENT_COPY_FILE)
+  endif()
+
+  # Hide output if requested, but save it to a variable in case there's an
+  # error so we can show the output upon failure. When not quiet, don't
+  # capture the output to a variable because the user may want to see the
+  # output as it happens (e.g. progress during long downloads). Combine both
+  # stdout and stderr in the one capture variable so the output stays in order.
+  if (ARG_QUIET)
+    set(outputOptions
+        OUTPUT_VARIABLE capturedOutput
+        ERROR_VARIABLE  capturedOutput
+    )
+  else()
+    set(capturedOutput)
+    set(outputOptions)
+    message(STATUS "Populating ${contentName}")
+  endif()
+
+  if(CMAKE_GENERATOR)
+    set(subCMakeOpts "-G${CMAKE_GENERATOR}")
+    if(CMAKE_GENERATOR_PLATFORM)
+      list(APPEND subCMakeOpts "-A${CMAKE_GENERATOR_PLATFORM}")
+    endif()
+    if(CMAKE_GENERATOR_TOOLSET)
+      list(APPEND subCMakeOpts "-T${CMAKE_GENERATOR_TOOLSET}")
+    endif()
+
+    if(CMAKE_MAKE_PROGRAM)
+      list(APPEND subCMakeOpts "-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}")
+    endif()
+
+    # Override the sub-build's configuration types for multi-config generators.
+    # This ensures we are not affected by any custom setting from the project
+    # and can always request a known configuration further below.
+    get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    if(is_multi_config)
+      list(APPEND subCMakeOpts "-DCMAKE_CONFIGURATION_TYPES:STRING=Debug")
+    endif()
+
+  else()
+    # Likely we've been invoked via CMake's script mode where no
+    # generator is set (and hence CMAKE_MAKE_PROGRAM could not be
+    # trusted even if provided). We will have to rely on being
+    # able to find the default generator and build tool.
+    unset(subCMakeOpts)
+  endif()
+
+  set(__FETCHCONTENT_CACHED_INFO "")
+  set(__passthrough_vars
+    CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY
+    CMAKE_TLS_VERIFY
+    CMAKE_TLS_CAINFO
+    CMAKE_NETRC
+    CMAKE_NETRC_FILE
+  )
+  foreach(var IN LISTS __passthrough_vars)
+    if(DEFINED ${var})
+      # Embed directly in the generated CMakeLists.txt file to avoid making
+      # the cmake command line excessively long. It also makes debugging and
+      # testing easier.
+      string(APPEND __FETCHCONTENT_CACHED_INFO "set(${var} [==[${${var}}]==])\n")
+    endif()
+  endforeach()
+
+  # Avoid using if(... IN_LIST ...) so we don't have to alter policy settings
+  list(FIND ARG_UNPARSED_ARGUMENTS GIT_REPOSITORY indexResult)
+  if(indexResult GREATER_EQUAL 0)
+    find_package(Git QUIET)
+    string(APPEND __FETCHCONTENT_CACHED_INFO "
+# Pass through things we've already detected in the main project to avoid
+# paying the cost of redetecting them again in ExternalProject_Add()
+set(GIT_EXECUTABLE [==[${GIT_EXECUTABLE}]==])
+set(GIT_VERSION_STRING [==[${GIT_VERSION_STRING}]==])
+set_property(GLOBAL PROPERTY _CMAKE_FindGit_GIT_EXECUTABLE_VERSION
+  [==[${GIT_EXECUTABLE};${GIT_VERSION_STRING}]==]
+)
+")
+  endif()
+
+  # Create and build a separate CMake project to carry out the population.
+  # If we've already previously done these steps, they will not cause
+  # anything to be updated, so extra rebuilds of the project won't occur.
+  # Make sure to pass through CMAKE_MAKE_PROGRAM in case the main project
+  # has this set to something not findable on the PATH. We also ensured above
+  # that the Debug config will be defined for multi-config generators.
+  configure_file("${CMAKE_CURRENT_FUNCTION_LIST_DIR}/FetchContent/CMakeLists.cmake.in"
+                 "${ARG_SUBBUILD_DIR}/CMakeLists.txt")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} ${subCMakeOpts} .
+    RESULT_VARIABLE result
+    ${outputOptions}
+    WORKING_DIRECTORY "${ARG_SUBBUILD_DIR}"
+  )
+  if(result)
+    if(capturedOutput)
+      message("${capturedOutput}")
+    endif()
+    message(FATAL_ERROR "CMake step for ${contentName} failed: ${result}")
+  endif()
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} --build . --config Debug
+    RESULT_VARIABLE result
+    ${outputOptions}
+    WORKING_DIRECTORY "${ARG_SUBBUILD_DIR}"
+  )
+  if(result)
+    if(capturedOutput)
+      message("${capturedOutput}")
+    endif()
+    message(FATAL_ERROR "Build step for ${contentName} failed: ${result}")
+  endif()
+
+endfunction()
+
+
+option(FETCHCONTENT_FULLY_DISCONNECTED   "Disables all attempts to download or update content and assumes source dirs already exist")
+option(FETCHCONTENT_UPDATES_DISCONNECTED "Enables UPDATE_DISCONNECTED behavior for all content population")
+option(FETCHCONTENT_QUIET                "Enables QUIET option for all content population" ON)
+set(FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/_deps" CACHE PATH "Directory under which to collect all populated content")
+
+# Populate the specified content using details stored from
+# an earlier call to FetchContent_Declare().
+function(FetchContent_Populate contentName)
+
+  if(NOT contentName)
+    message(FATAL_ERROR "Empty contentName not allowed for FetchContent_Populate()")
+  endif()
+
+  string(TOLOWER ${contentName} contentNameLower)
+
+  if(ARGN)
+    # This is the direct population form with details fully specified
+    # as part of the call, so we already have everything we need
+    __FetchContent_directPopulate(
+      ${contentNameLower}
+      SUBBUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/${contentNameLower}-subbuild"
+      SOURCE_DIR   "${CMAKE_CURRENT_BINARY_DIR}/${contentNameLower}-src"
+      BINARY_DIR   "${CMAKE_CURRENT_BINARY_DIR}/${contentNameLower}-build"
+      ${ARGN}  # Could override any of the above ..._DIR variables
+    )
+
+    # Pass source and binary dir variables back to the caller
+    set(${contentNameLower}_SOURCE_DIR "${${contentNameLower}_SOURCE_DIR}" PARENT_SCOPE)
+    set(${contentNameLower}_BINARY_DIR "${${contentNameLower}_BINARY_DIR}" PARENT_SCOPE)
+
+    # Don't set global properties, or record that we did this population, since
+    # this was a direct call outside of the normal declared details form.
+    # We only want to save values in the global properties for content that
+    # honors the hierarchical details mechanism so that projects are not
+    # robbed of the ability to override details set in nested projects.
+    return()
+  endif()
+
+  # No details provided, so assume they were saved from an earlier call
+  # to FetchContent_Declare(). Do a check that we haven't already
+  # populated this content before in case the caller forgot to check.
+  FetchContent_GetProperties(${contentName})
+  if(${contentNameLower}_POPULATED)
+    if("${${contentNameLower}_SOURCE_DIR}" STREQUAL "")
+      message(FATAL_ERROR
+        "Content ${contentName} already populated by find_package() or a "
+        "dependency provider"
+      )
+    else()
+      message(FATAL_ERROR
+        "Content ${contentName} already populated in ${${contentNameLower}_SOURCE_DIR}"
+      )
+    endif()
+  endif()
+
+  __FetchContent_getSavedDetails(${contentName} contentDetails)
+  if("${contentDetails}" STREQUAL "")
+    message(FATAL_ERROR "No details have been set for content: ${contentName}")
+  endif()
+
+  string(TOUPPER ${contentName} contentNameUpper)
+  set(FETCHCONTENT_SOURCE_DIR_${contentNameUpper}
+      "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}"
+      CACHE PATH "When not empty, overrides where to find pre-populated content for ${contentName}")
+
+  if(FETCHCONTENT_SOURCE_DIR_${contentNameUpper})
+    # The source directory has been explicitly provided in the cache,
+    # so no population is required. The build directory may still be specified
+    # by the declared details though.
+
+    if(NOT IS_ABSOLUTE "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
+      # Don't check this directory because we don't know what location it is
+      # expected to be relative to. We can't make this a hard error for backward
+      # compatibility reasons.
+      message(WARNING "Relative source directory specified. This is not safe, "
+        "as it depends on the calling directory scope.\n"
+        "  FETCHCONTENT_SOURCE_DIR_${contentNameUpper} --> ${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
+    elseif(NOT EXISTS "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
+      message(FATAL_ERROR "Manually specified source directory is missing:\n"
+        "  FETCHCONTENT_SOURCE_DIR_${contentNameUpper} --> ${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
+    endif()
+
+    set(${contentNameLower}_SOURCE_DIR "${FETCHCONTENT_SOURCE_DIR_${contentNameUpper}}")
+
+    cmake_parse_arguments(savedDetails "" "BINARY_DIR" "" ${contentDetails})
+
+    if(savedDetails_BINARY_DIR)
+      set(${contentNameLower}_BINARY_DIR ${savedDetails_BINARY_DIR})
+    else()
+      set(${contentNameLower}_BINARY_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build")
+    endif()
+
+  elseif(FETCHCONTENT_FULLY_DISCONNECTED)
+    # Bypass population and assume source is already there from a previous run.
+    # Declared details may override the default source or build directories.
+
+    cmake_parse_arguments(savedDetails "" "SOURCE_DIR;BINARY_DIR" "" ${contentDetails})
+
+    if(savedDetails_SOURCE_DIR)
+      set(${contentNameLower}_SOURCE_DIR ${savedDetails_SOURCE_DIR})
+    else()
+      set(${contentNameLower}_SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-src")
+    endif()
+
+    if(savedDetails_BINARY_DIR)
+      set(${contentNameLower}_BINARY_DIR ${savedDetails_BINARY_DIR})
+    else()
+      set(${contentNameLower}_BINARY_DIR "${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build")
+    endif()
+
+  else()
+    # Support both a global "disconnect all updates" and a per-content
+    # update test (either one being set disables updates for this content).
+    option(FETCHCONTENT_UPDATES_DISCONNECTED_${contentNameUpper}
+           "Enables UPDATE_DISCONNECTED behavior just for population of ${contentName}")
+    if(FETCHCONTENT_UPDATES_DISCONNECTED OR
+       FETCHCONTENT_UPDATES_DISCONNECTED_${contentNameUpper})
+      set(disconnectUpdates True)
+    else()
+      set(disconnectUpdates False)
+    endif()
+
+    if(FETCHCONTENT_QUIET)
+      set(quietFlag QUIET)
+    else()
+      unset(quietFlag)
+    endif()
+
+    set(__detailsQuoted)
+    foreach(__item IN LISTS contentDetails)
+      if(NOT __item STREQUAL "OVERRIDE_FIND_PACKAGE")
+        string(APPEND __detailsQuoted " [==[${__item}]==]")
+      endif()
+    endforeach()
+    cmake_language(EVAL CODE "
+      __FetchContent_directPopulate(
+        ${contentNameLower}
+        ${quietFlag}
+        UPDATE_DISCONNECTED ${disconnectUpdates}
+        SUBBUILD_DIR \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-subbuild\"
+        SOURCE_DIR   \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-src\"
+        BINARY_DIR   \"${FETCHCONTENT_BASE_DIR}/${contentNameLower}-build\"
+        # Put the saved details last so they can override any of the
+        # the options we set above (this can include SOURCE_DIR or
+        # BUILD_DIR)
+        ${__detailsQuoted}
+      )"
+    )
+  endif()
+
+  FetchContent_SetPopulated(
+    ${contentName}
+    SOURCE_DIR "${${contentNameLower}_SOURCE_DIR}"
+    BINARY_DIR "${${contentNameLower}_BINARY_DIR}"
+  )
+
+  # Pass variables back to the caller. The variables passed back here
+  # must match what FetchContent_GetProperties() sets when it is called
+  # with just the content name.
+  set(${contentNameLower}_SOURCE_DIR "${${contentNameLower}_SOURCE_DIR}" PARENT_SCOPE)
+  set(${contentNameLower}_BINARY_DIR "${${contentNameLower}_BINARY_DIR}" PARENT_SCOPE)
+  set(${contentNameLower}_POPULATED  True PARENT_SCOPE)
+
+endfunction()
+
+function(__FetchContent_setupFindPackageRedirection contentName)
+
+  __FetchContent_getSavedDetails(${contentName} contentDetails)
+
+  string(TOLOWER ${contentName} contentNameLower)
+  get_property(wantFindPackage GLOBAL PROPERTY
+    _FetchContent_${contentNameLower}_find_package_args
+    DEFINED
+  )
+
+  # Avoid using if(... IN_LIST ...) so we don't have to alter policy settings
+  list(FIND contentDetails OVERRIDE_FIND_PACKAGE indexResult)
+  if(NOT wantFindPackage AND indexResult EQUAL -1)
+    # No find_package() redirection allowed
+    return()
+  endif()
+
+  # We write out dep-config.cmake and dep-config-version.cmake file name
+  # forms here because they are forced to lowercase. FetchContent
+  # dependency names are case-insensitive, but find_package() config files
+  # are only case-insensitive for the -config and -config-version forms,
+  # not the Config and ConfigVersion forms.
+  set(inFileDir ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/FetchContent)
+  set(configFilePrefix1 "${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/${contentName}Config")
+  set(configFilePrefix2 "${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}/${contentNameLower}-config")
+  if(NOT EXISTS "${configFilePrefix1}.cmake" AND
+    NOT EXISTS "${configFilePrefix2}.cmake")
+    configure_file(${inFileDir}/package-config.cmake.in
+      "${configFilePrefix2}.cmake" @ONLY
+    )
+  endif()
+  if(NOT EXISTS "${configFilePrefix1}Version.cmake" AND
+    NOT EXISTS "${configFilePrefix2}-version.cmake")
+    configure_file(${inFileDir}/package-config-version.cmake.in
+      "${configFilePrefix2}-version.cmake" @ONLY
+    )
+  endif()
+
+  # Now that we've created the redirected package config files, prevent
+  # find_package() from delegating to FetchContent and let it find these
+  # config files through its normal processing.
+  set(propertyName "${prefix}_override_find_package")
+  set(GLOBAL PROPERTY ${propertyName} FALSE)
+  set(${contentName}_DIR "${CMAKE_FIND_PACKAGE_REDIRECTS_DIR}"
+    CACHE INTERNAL "Redirected by FetchContent"
+  )
+
+endfunction()
+
+# Arguments are assumed to be the names of dependencies that have been
+# declared previously and should be populated. It is not an error if
+# any of them have already been populated (they will just be skipped in
+# that case). The command is implemented as a macro so that the variables
+# defined by the FetchContent_GetProperties() and FetchContent_Populate()
+# calls will be available to the caller.
+macro(FetchContent_MakeAvailable)
+
+  # We must append an item, even if the variable is unset, so prefix its value.
+  # We will strip that prefix when we pop the value at the end of the macro.
+  list(APPEND __cmake_fcCurrentVarsStack
+    "__fcprefix__${CMAKE_VERIFY_INTERFACE_HEADER_SETS}"
+  )
+  set(CMAKE_VERIFY_INTERFACE_HEADER_SETS FALSE)
+
+  get_property(__cmake_providerCommand GLOBAL PROPERTY
+    __FETCHCONTENT_MAKEAVAILABLE_SERIAL_PROVIDER
+  )
+  foreach(__cmake_contentName IN ITEMS ${ARGV})
+    string(TOLOWER ${__cmake_contentName} __cmake_contentNameLower)
+
+    # If user specified FETCHCONTENT_SOURCE_DIR_... for this dependency, that
+    # overrides everything else and we shouldn't try to use find_package() or
+    # a dependency provider.
+    string(TOUPPER ${__cmake_contentName} __cmake_contentNameUpper)
+    if("${FETCHCONTENT_SOURCE_DIR_${__cmake_contentNameUpper}}" STREQUAL "")
+      # Dependency provider gets first opportunity, but prevent infinite
+      # recursion if we are called again for the same thing
+      if(NOT "${__cmake_providerCommand}" STREQUAL "" AND
+        NOT DEFINED __cmake_fcProvider_${__cmake_contentNameLower})
+        message(VERBOSE
+          "Trying FETCHCONTENT_MAKEAVAILABLE_SERIAL dependency provider for "
+          "${__cmake_contentName}"
+        )
+        # It's still valid if there are no saved details. The project may have
+        # been written to assume a dependency provider is always set and will
+        # provide dependencies without having any declared details for them.
+        __FetchContent_getSavedDetails(${__cmake_contentName} __cmake_contentDetails)
+        set(__cmake_providerArgs
+          "FETCHCONTENT_MAKEAVAILABLE_SERIAL"
+          "${__cmake_contentName}"
+        )
+        # Empty arguments must be preserved because of things like
+        # GIT_SUBMODULES (see CMP0097)
+        foreach(__cmake_item IN LISTS __cmake_contentDetails)
+          string(APPEND __cmake_providerArgs " [==[${__cmake_item}]==]")
+        endforeach()
+
+        # This property might be defined but empty. As long as it is defined,
+        # find_package() can be called.
+        get_property(__cmake_addfpargs GLOBAL PROPERTY
+          _FetchContent_${contentNameLower}_find_package_args
+          DEFINED
+        )
+        if(__cmake_addfpargs)
+          get_property(__cmake_fpargs GLOBAL PROPERTY
+            _FetchContent_${contentNameLower}_find_package_args
+          )
+          string(APPEND __cmake_providerArgs " FIND_PACKAGE_ARGS")
+          foreach(__cmake_item IN LISTS __cmake_fpargs)
+            string(APPEND __cmake_providerArgs " [==[${__cmake_item}]==]")
+          endforeach()
+        endif()
+
+        # Calling the provider could lead to FetchContent_MakeAvailable() being
+        # called for a nested dependency. That nested call may occur in the
+        # current variable scope. We have to save and restore the variables we
+        # need preserved.
+        list(APPEND __cmake_fcCurrentVarsStack
+          ${__cmake_contentName}
+          ${__cmake_contentNameLower}
+        )
+
+        set(__cmake_fcProvider_${__cmake_contentNameLower} YES)
+        cmake_language(EVAL CODE "${__cmake_providerCommand}(${__cmake_providerArgs})")
+
+        list(POP_BACK __cmake_fcCurrentVarsStack
+          __cmake_contentNameLower
+          __cmake_contentName
+        )
+
+        unset(__cmake_fcProvider_${__cmake_contentNameLower})
+        unset(__cmake_providerArgs)
+        unset(__cmake_addfpargs)
+        unset(__cmake_fpargs)
+        unset(__cmake_item)
+        unset(__cmake_contentDetails)
+
+        FetchContent_GetProperties(${__cmake_contentName})
+        if(${__cmake_contentNameLower}_POPULATED)
+          continue()
+        endif()
+      endif()
+
+      # Check if we've been asked to try find_package() first, even if we
+      # have already populated this dependency. If we previously tried to
+      # use find_package() for this and it succeeded, those things might
+      # no longer be in scope, so we have to do it again.
+      get_property(__cmake_haveFpArgs GLOBAL PROPERTY
+        _FetchContent_${__cmake_contentNameLower}_find_package_args DEFINED
+      )
+      if(__cmake_haveFpArgs)
+        unset(__cmake_haveFpArgs)
+        message(VERBOSE "Trying find_package(${__cmake_contentName} ...) before FetchContent")
+        get_property(__cmake_fpArgs GLOBAL PROPERTY
+          _FetchContent_${__cmake_contentNameLower}_find_package_args
+        )
+
+        # This call could lead to FetchContent_MakeAvailable() being called for
+        # a nested dependency and it may occur in the current variable scope.
+        # We have to save/restore the variables we need to preserve.
+        list(APPEND __cmake_fcCurrentNameStack
+          ${__cmake_contentName}
+          ${__cmake_contentNameLower}
+        )
+        find_package(${__cmake_contentName} ${__cmake_fpArgs})
+        list(POP_BACK __cmake_fcCurrentNameStack
+          __cmake_contentNameLower
+          __cmake_contentName
+        )
+        unset(__cmake_fpArgs)
+
+        if(${__cmake_contentName}_FOUND)
+          FetchContent_SetPopulated(${__cmake_contentName})
+          FetchContent_GetProperties(${__cmake_contentName})
+          continue()
+        endif()
+      endif()
+    else()
+      unset(__cmake_haveFpArgs)
+    endif()
+
+    FetchContent_GetProperties(${__cmake_contentName})
+    if(NOT ${__cmake_contentNameLower}_POPULATED)
+      FetchContent_Populate(${__cmake_contentName})
+      __FetchContent_setupFindPackageRedirection(${__cmake_contentName})
+
+      # Only try to call add_subdirectory() if the populated content
+      # can be treated that way. Protecting the call with the check
+      # allows this function to be used for projects that just want
+      # to ensure the content exists, such as to provide content at
+      # a known location. We check the saved details for an optional
+      # SOURCE_SUBDIR which can be used in the same way as its meaning
+      # for ExternalProject. It won't matter if it was passed through
+      # to the ExternalProject sub-build, since it would have been
+      # ignored there.
+      set(__cmake_srcdir "${${__cmake_contentNameLower}_SOURCE_DIR}")
+      __FetchContent_getSavedDetails(${__cmake_contentName} __cmake_contentDetails)
+      if("${__cmake_contentDetails}" STREQUAL "")
+        message(FATAL_ERROR "No details have been set for content: ${__cmake_contentName}")
+      endif()
+      cmake_parse_arguments(__cmake_arg "SYSTEM" "SOURCE_SUBDIR" "" ${__cmake_contentDetails})
+      if(NOT "${__cmake_arg_SOURCE_SUBDIR}" STREQUAL "")
+        string(APPEND __cmake_srcdir "/${__cmake_arg_SOURCE_SUBDIR}")
+      endif()
+
+      if(EXISTS ${__cmake_srcdir}/CMakeLists.txt)
+        if (__cmake_arg_SYSTEM)
+          add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} SYSTEM)
+        else()
+          add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR})
+        endif()
+      endif()
+
+      unset(__cmake_srcdir)
+      unset(__cmake_contentDetails)
+      unset(__cmake_arg_SOURCE_SUBDIR)
+    endif()
+  endforeach()
+
+  # Prefix will be "__fcprefix__"
+  list(POP_BACK __cmake_fcCurrentVarsStack __cmake_original_verify_setting)
+  string(SUBSTRING "${__cmake_original_verify_setting}"
+    12 -1 __cmake_original_verify_setting
+  )
+  set(CMAKE_VERIFY_INTERFACE_HEADER_SETS ${__cmake_original_verify_setting})
+
+  # clear local variables to prevent leaking into the caller's scope
+  unset(__cmake_contentName)
+  unset(__cmake_contentNameLower)
+  unset(__cmake_contentNameUpper)
+  unset(__cmake_providerCommand)
+  unset(__cmake_original_verify_setting)
+
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FetchContent/CMakeLists.cmake.in b/deps/cmake/share/cmake-3.25/Modules/FetchContent/CMakeLists.cmake.in
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FetchContent/CMakeLists.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/FetchContent/CMakeLists.cmake.in
index 5ebb12f1..d94b0f41 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FetchContent/CMakeLists.cmake.in
+++ b/deps/cmake/share/cmake-3.25/Modules/FetchContent/CMakeLists.cmake.in
@@ -22,6 +22,7 @@ ExternalProject_Add(${contentName}-populate
                     TEST_COMMAND        ""
                     USES_TERMINAL_DOWNLOAD  YES
                     USES_TERMINAL_UPDATE    YES
+                    USES_TERMINAL_PATCH     YES
 )
 
 @__FETCHCONTENT_COPY_FILE@
diff --git a/deps/cmake/share/cmake-3.25/Modules/FetchContent/package-config-version.cmake.in b/deps/cmake/share/cmake-3.25/Modules/FetchContent/package-config-version.cmake.in
new file mode 100644
index 00000000..9fcade71
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FetchContent/package-config-version.cmake.in
@@ -0,0 +1,8 @@
+# Automatically generated by CMake's FetchContent module.
+# Do not edit this file, it will be regenerated every time CMake runs.
+
+# Version not available, assuming it is compatible. We must also say it is an
+# exact match to ensure find_package() calls with the EXACT keyword still get
+# redirected.
+set(PACKAGE_VERSION_COMPATIBLE TRUE)
+set(PACKAGE_VERSION_EXACT TRUE)
diff --git a/deps/cmake/share/cmake-3.25/Modules/FetchContent/package-config.cmake.in b/deps/cmake/share/cmake-3.25/Modules/FetchContent/package-config.cmake.in
new file mode 100644
index 00000000..c3b64c90
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FetchContent/package-config.cmake.in
@@ -0,0 +1,11 @@
+# Automatically generated by CMake's FetchContent module.
+# Do not edit this file, it will be regenerated every time CMake runs.
+
+# Projects or the dependencies themselves can provide the following files.
+# The files should define any additional commands or variables that the
+# dependency would normally provide but which won't be available globally
+# if the dependency is brought into the build via FetchContent instead.
+# For dependencies that only provide imported targets and no commands,
+# these typically won't be needed.
+include("${CMAKE_CURRENT_LIST_DIR}/@contentNameLower@-extra.cmake" OPTIONAL)
+include("${CMAKE_CURRENT_LIST_DIR}/@contentName@Extra.cmake" OPTIONAL)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindALSA.cmake b/deps/cmake/share/cmake-3.25/Modules/FindALSA.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindALSA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindALSA.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindASPELL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindASPELL.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindASPELL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindASPELL.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindAVIFile.cmake b/deps/cmake/share/cmake-3.25/Modules/FindAVIFile.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindAVIFile.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindAVIFile.cmake
index 96554405..d63b707a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindAVIFile.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindAVIFile.cmake
@@ -7,7 +7,7 @@ FindAVIFile
 
 Locate AVIFILE library and include paths
 
-AVIFILE (http://avifile.sourceforge.net/) is a set of libraries for
+AVIFILE (https://avifile.sourceforge.net/) is a set of libraries for
 i386 machines to use various AVI codecs.  Support is limited beyond
 Linux.  Windows provides native AVI support, and so doesn't need this
 library.  This module defines
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindArmadillo.cmake b/deps/cmake/share/cmake-3.25/Modules/FindArmadillo.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindArmadillo.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindArmadillo.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindBISON.cmake b/deps/cmake/share/cmake-3.25/Modules/FindBISON.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindBISON.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindBISON.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindBLAS.cmake b/deps/cmake/share/cmake-3.25/Modules/FindBLAS.cmake
similarity index 80%
rename from deps/cmake/share/cmake-3.21/Modules/FindBLAS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindBLAS.cmake
index 726ff75b..7af10170 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindBLAS.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindBLAS.cmake
@@ -12,7 +12,7 @@ This module finds an installed Fortran library that implements the
 
 At least one of the ``C``, ``CXX``, or ``Fortran`` languages must be enabled.
 
-.. _`BLAS linear-algebra interface`: http://www.netlib.org/blas/
+.. _`BLAS linear-algebra interface`: https://netlib.org/blas/
 
 Input Variables
 ^^^^^^^^^^^^^^^
@@ -35,6 +35,25 @@ The following variables may be set to influence this module's behavior:
   if set ``pkg-config`` will be used to search for a BLAS library first
   and if one is found that is preferred
 
+``BLA_PKGCONFIG_BLAS``
+  .. versionadded:: 3.25
+
+  If set, the ``pkg-config`` method will look for this module name instead of
+  just ``blas``.
+
+``BLA_SIZEOF_INTEGER``
+  .. versionadded:: 3.22
+
+  Specify the BLAS/LAPACK library integer size:
+
+  ``4``
+    Search for a BLAS/LAPACK with 32-bit integer interfaces.
+  ``8``
+    Search for a BLAS/LAPACK with 64-bit integer interfaces.
+  ``ANY``
+    Search for any BLAS/LAPACK.
+    Most likely, a BLAS/LAPACK with 32-bit integer interfaces will be found.
+
 Imported targets
 ^^^^^^^^^^^^^^^^
 
@@ -101,15 +120,16 @@ BLAS/LAPACK Vendors
 ``FlexiBLAS``
   .. versionadded:: 3.19
 
-``Fujitsu_SSL2``, ``Fujitsu_SSL2BLAMP``
+``Fujitsu_SSL2``, ``Fujitsu_SSL2BLAMP``, ``Fujitsu_SSL2SVE``, ``Fujitsu_SSL2BLAMPSVE``
   .. versionadded:: 3.20
 
-  Fujitsu SSL2 serial and parallel blas/lapack
+  Fujitsu SSL2 serial and parallel blas/lapack with SVE instructions
 
 ``Goto``
   GotoBLAS
 
-``IBMESSL``
+``IBMESSL``, ``IBMESSL_SMP``
+
   IBM Engineering and Scientific Subroutine Library
 
 ``Intel``
@@ -150,7 +170,7 @@ BLAS/LAPACK Vendors
 ``PhiPACK``
   Portable High Performance ANSI C (PHiPAC)
 
-``SCSL``
+``SCSL``, ``SCSL_mp``
   Scientific Computing Software Library
 
 ``SGIMATH``
@@ -259,8 +279,11 @@ endif()
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 
 if(BLA_PREFER_PKGCONFIG)
-  find_package(PkgConfig)
-  pkg_check_modules(PKGC_BLAS blas)
+  if(NOT BLA_PKGCONFIG_BLAS)
+    set(BLA_PKGCONFIG_BLAS "blas")
+  endif()
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(PKGC_BLAS QUIET ${BLA_PKGCONFIG_BLAS})
   if(PKGC_BLAS_FOUND)
     set(BLAS_FOUND ${PKGC_BLAS_FOUND})
     set(BLAS_LIBRARIES "${PKGC_BLAS_LINK_LIBRARIES}")
@@ -312,9 +335,9 @@ function(CHECK_BLAS_LIBRARIES LIBRARIES _prefix _name _flags _list _deps _addlib
       list(APPEND _libraries "${_library}")
     else()
       string(REGEX REPLACE "[^A-Za-z0-9]" "_" _lib_var "${_library}")
-      set(_combined_name ${_combined_name}_${_lib_var})
+      string(APPEND _combined_name "_${_lib_var}")
       if(NOT "${_deps}" STREQUAL "")
-        set(_combined_name ${_combined_name}_deps)
+        string(APPEND _combined_name "_deps")
       endif()
       if(_libraries_work)
         find_library(${_prefix}_${_lib_var}_LIBRARY
@@ -332,7 +355,7 @@ function(CHECK_BLAS_LIBRARIES LIBRARIES _prefix _name _flags _list _deps _addlib
 
   foreach(_flag ${_flags})
     string(REGEX REPLACE "[^A-Za-z0-9]" "_" _flag_var "${_flag}")
-    set(_combined_name ${_combined_name}_${_flag_var})
+    string(APPEND _combined_name "_${_flag_var}")
   endforeach()
   if(_libraries_work)
     # Test this combination of libraries.
@@ -371,6 +394,17 @@ else()
   endif()
 endif()
 
+if(NOT BLA_SIZEOF_INTEGER)
+  # in the reality we do not know which API of BLAS/LAPACK is masked in library
+  set(_blas_sizeof_integer "ANY")
+elseif((BLA_SIZEOF_INTEGER STREQUAL "ANY") OR
+       (BLA_SIZEOF_INTEGER STREQUAL "4") OR
+       (BLA_SIZEOF_INTEGER STREQUAL "8"))
+  set(_blas_sizeof_integer ${BLA_SIZEOF_INTEGER})
+else()
+  message(FATAL_ERROR "BLA_SIZEOF_INTEGER can have only <no value>, ANY, 4, or 8 values")
+endif()
+
 # Implicitly linked BLAS libraries?
 if(BLA_VENDOR STREQUAL "All")
   if(NOT BLAS_LIBRARIES)
@@ -386,6 +420,8 @@ if(BLA_VENDOR STREQUAL "All")
       )
   endif()
   if(BLAS_WORKS)
+    # Give a more helpful "found" message
+    set(BLAS_WORKS "implicitly linked")
     set(_blas_fphsa_req_var BLAS_WORKS)
   endif()
 endif()
@@ -410,7 +446,7 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
           set(BLAS_mkl_END_GROUP "")
         endif()
         # Switch to GNU Fortran support layer if needed (but not on Apple, where MKL does not provide it)
-        if(CMAKE_Fortran_COMPILER_LOADED AND CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND NOT APPLE)
+        if(CMAKE_Fortran_COMPILER_LOADED AND (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "LCC") AND NOT APPLE)
             set(BLAS_mkl_INTFACE "gf")
             set(BLAS_mkl_THREADING "gnu")
             set(BLAS_mkl_OMP "gomp")
@@ -429,17 +465,23 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
         find_package(Threads REQUIRED)
       endif()
 
-      if(BLA_VENDOR MATCHES "_64ilp")
+      if(_blas_sizeof_integer EQUAL 8)
         set(BLAS_mkl_ILP_MODE "ilp64")
-      else()
+      elseif(_blas_sizeof_integer EQUAL 4)
         set(BLAS_mkl_ILP_MODE "lp64")
+      else()
+        if(BLA_VENDOR MATCHES "_64ilp")
+          set(BLAS_mkl_ILP_MODE "ilp64")
+        else()
+          set(BLAS_mkl_ILP_MODE "lp64")
+        endif()
       endif()
 
       set(BLAS_SEARCH_LIBS "")
 
       if(BLA_F95)
         set(BLAS_mkl_SEARCH_SYMBOL "sgemm_f95")
-        set(_LIBRARIES BLAS95_LIBRARIES)
+        set(_BLAS_LIBRARIES BLAS95_LIBRARIES)
         if(WIN32)
           # Find the main file (32-bit or 64-bit)
           set(BLAS_SEARCH_LIBS_WIN_MAIN "")
@@ -501,7 +543,7 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
         endif()
       else()
         set(BLAS_mkl_SEARCH_SYMBOL sgemm)
-        set(_LIBRARIES BLAS_LIBRARIES)
+        set(_BLAS_LIBRARIES BLAS_LIBRARIES)
         if(WIN32)
           # Find the main file (32-bit or 64-bit)
           set(BLAS_SEARCH_LIBS_WIN_MAIN "")
@@ -613,15 +655,15 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
           "lib/${BLAS_mkl_ARCH_NAME}"
           )
 
-      foreach(IT ${BLAS_SEARCH_LIBS})
-        string(REPLACE " " ";" SEARCH_LIBS ${IT})
-        if(NOT ${_LIBRARIES})
+      foreach(_search ${BLAS_SEARCH_LIBS})
+        string(REPLACE " " ";" _search ${_search})
+        if(NOT ${_BLAS_LIBRARIES})
           check_blas_libraries(
-            ${_LIBRARIES}
+            ${_BLAS_LIBRARIES}
             BLAS
             ${BLAS_mkl_SEARCH_SYMBOL}
             ""
-            "${SEARCH_LIBS}"
+            "${_search}"
             "${CMAKE_THREAD_LIBS_INIT};${BLAS_mkl_LM};${BLAS_mkl_LDL}"
             "${BLAS_mkl_MKLROOT}"
             "${BLAS_mkl_LIB_PATH_SUFFIXES}"
@@ -629,6 +671,7 @@ if(BLA_VENDOR MATCHES "Intel" OR BLA_VENDOR STREQUAL "All")
         endif()
       endforeach()
 
+      unset(_search)
       unset(BLAS_mkl_ILP_MODE)
       unset(BLAS_mkl_INTFACE)
       unset(BLAS_mkl_THREADING)
@@ -671,29 +714,43 @@ endif()
 
 # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
 if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All")
+  set(_blas_flexiblas_lib "flexiblas")
+
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_flexiblas_lib "64")
+  endif()
+
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
       BLAS_LIBRARIES
       BLAS
       sgemm
       ""
-      "flexiblas"
+      "${_blas_flexiblas_lib}"
       ""
       ""
       ""
       )
   endif()
+
+  unset(_blas_flexiblas_lib)
 endif()
 
 # OpenBLAS? (http://www.openblas.net)
 if(BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
+  set(_blas_openblas_lib "openblas")
+
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_openblas_lib "64")
+  endif()
+
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
       BLAS_LIBRARIES
       BLAS
       sgemm
       ""
-      "openblas"
+      "${_blas_openblas_lib}"
       ""
       ""
       ""
@@ -708,10 +765,10 @@ if(BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
     set(_threadlibs "${CMAKE_THREAD_LIBS_INIT}")
     if(BLA_STATIC)
       if (CMAKE_C_COMPILER_LOADED)
-        find_package(OpenMP COMPONENTS C)
+        find_package(OpenMP QUIET COMPONENTS C)
         list(PREPEND _threadlibs "${OpenMP_C_LIBRARIES}")
       elseif(CMAKE_CXX_COMPILER_LOADED)
-        find_package(OpenMP COMPONENTS CXX)
+        find_package(OpenMP QUIET COMPONENTS CXX)
         list(PREPEND _threadlibs "${OpenMP_CXX_LIBRARIES}")
       endif()
     endif()
@@ -720,59 +777,75 @@ if(BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All")
       BLAS
       sgemm
       ""
-      "openblas"
+      "${_blas_openblas_lib}"
       "${_threadlibs}"
       ""
       ""
       )
     unset(_threadlibs)
   endif()
+
+  unset(_blas_openblas_lib)
 endif()
 
 # ArmPL blas library? (https://developer.arm.com/tools-and-software/server-and-hpc/compile/arm-compiler-for-linux/arm-performance-libraries)
 if(BLA_VENDOR MATCHES "Arm" OR BLA_VENDOR STREQUAL "All")
 
    # Check for 64bit Integer support
-   if(BLA_VENDOR MATCHES "_ilp64")
-     set(BLAS_armpl_LIB "armpl_ilp64")
-   else()
-     set(BLAS_armpl_LIB "armpl_lp64")
-   endif()
+  if(_blas_sizeof_integer EQUAL 8)
+    set(_blas_armpl_lib "armpl_ilp64")
+  elseif(_blas_sizeof_integer EQUAL 4)
+    set(_blas_armpl_lib "armpl_lp64")
+  else()
+    if(BLA_VENDOR MATCHES "_ilp64")
+      set(_blas_armpl_lib "armpl_ilp64")
+    else()
+      set(_blas_armpl_lib "armpl_lp64")
+    endif()
+  endif()
 
    # Check for OpenMP support, VIA BLA_VENDOR of Arm_mp or Arm_ipl64_mp
    if(BLA_VENDOR MATCHES "_mp")
-     set(BLAS_armpl_LIB "${BLAS_armpl_LIB}_mp")
+     string(APPEND _blas_armpl_lib "_mp")
    endif()
 
    if(NOT BLAS_LIBRARIES)
-    check_blas_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "${BLAS_armpl_LIB}"
-      ""
-      ""
-      ""
-      )
+     check_blas_libraries(
+       BLAS_LIBRARIES
+       BLAS
+       sgemm
+       ""
+       "${_blas_armpl_lib}"
+       ""
+       ""
+       ""
+       )
   endif()
-
+  unset(_blas_armpl_lib)
 endif()
 
 # FLAME's blis library? (https://github.com/flame/blis)
 if(BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All")
+  set(_blas_flame_lib "blis")
+
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_flame_lib "64")
+  endif()
+
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
       BLAS_LIBRARIES
       BLAS
       sgemm
       ""
-      "blis"
+      "${_blas_flame_lib}"
       ""
       ""
       ""
       )
   endif()
+
+  unset(_blas_flame_lib)
 endif()
 
 # BLAS in the ATLAS library? (http://math-atlas.sourceforge.net/)
@@ -809,33 +882,45 @@ endif()
 
 # BLAS in Alpha CXML library?
 if(BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
-  if(NOT BLAS_LIBRARIES)
-    check_blas_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "cxml"
-      ""
-      ""
-      ""
-      )
+  if(_blas_sizeof_integer EQUAL 8)
+    if(BLA_VENDOR STREQUAL "CXML")
+      message(FATAL_ERROR "CXML does not support Int64 type")
+    endif()
+  else()
+    if(NOT BLAS_LIBRARIES)
+      check_blas_libraries(
+        BLAS_LIBRARIES
+        BLAS
+        sgemm
+        ""
+        "cxml"
+        ""
+        ""
+        ""
+        )
+    endif()
   endif()
 endif()
 
 # BLAS in Alpha DXML library? (now called CXML, see above)
 if(BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
-  if(NOT BLAS_LIBRARIES)
-    check_blas_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "dxml"
-      ""
-      ""
-      ""
-      )
+  if(_blas_sizeof_integer EQUAL 8)
+    if(BLA_VENDOR STREQUAL "DXML")
+      message(FATAL_ERROR "DXML does not support Int64 type")
+    endif()
+  else()
+    if(NOT BLAS_LIBRARIES)
+      check_blas_libraries(
+        BLAS_LIBRARIES
+        BLAS
+        sgemm
+        ""
+        "dxml"
+        ""
+        ""
+        ""
+        )
+    endif()
   endif()
 endif()
 
@@ -859,19 +944,30 @@ if(BLA_VENDOR STREQUAL "SunPerf" OR BLA_VENDOR STREQUAL "All")
 endif()
 
 # BLAS in SCSL library?  (SGI/Cray Scientific Library)
-if(BLA_VENDOR STREQUAL "SCSL" OR BLA_VENDOR STREQUAL "All")
+if(BLA_VENDOR MATCHES "SCSL" OR BLA_VENDOR STREQUAL "All")
+  set(_blas_scsl_lib "scs")
+
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_scsl_lib "_i8")
+  endif()
+  if(BLA_VENDOR MATCHES "_mp")
+    string(APPEND _blas_scsl_lib "_mp")
+  endif()
+
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
       BLAS_LIBRARIES
       BLAS
       sgemm
       ""
-      "scsl"
+      "${_blas_scsl_lib}"
       ""
       ""
       ""
       )
   endif()
+
+  unset(_blas_scsl_lib)
 endif()
 
 # BLAS in SGIMATH library?
@@ -890,20 +986,31 @@ if(BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")
   endif()
 endif()
 
-# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
-if(BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
+# BLAS in IBM ESSL library?
+if(BLA_VENDOR MATCHES "IBMESSL" OR BLA_VENDOR STREQUAL "All")
+  set(_blas_essl_lib "essl")
+
+  if(BLA_VENDOR MATCHES "_SMP")
+    string(APPEND _blas_essl_lib "smp")
+  endif()
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_essl_lib "6464")
+  endif()
+
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
       BLAS_LIBRARIES
       BLAS
       sgemm
       ""
-      "essl;blas"
+      "${_blas_essl_lib}"
       ""
       ""
       ""
       )
   endif()
+
+  unset(_blas_essl_lib)
 endif()
 
 # BLAS in acml library?
@@ -927,7 +1034,7 @@ if(BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All")
   list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT)
   if(_ACML_ROOT)
     get_filename_component(_ACML_ROOT ${_ACML_ROOT} PATH)
-    if(SIZEOF_INTEGER EQUAL 8)
+    if(_blas_sizeof_integer EQUAL 8)
       set(_ACML_PATH_SUFFIX "_int64")
     else()
       set(_ACML_PATH_SUFFIX "")
@@ -1054,102 +1161,179 @@ endif() # ACML
 
 # Apple BLAS library?
 if(BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
-  if(NOT BLAS_LIBRARIES)
-    check_blas_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      dgemm
-      ""
-      "Accelerate"
-      ""
-      ""
-      ""
-      )
+  if(_blas_sizeof_integer EQUAL 8)
+    if(BLA_VENDOR STREQUAL "Apple")
+      message(FATAL_ERROR "Accelerate Framework does not support Int64 type")
+    endif()
+  else()
+    if(NOT BLAS_LIBRARIES)
+      check_blas_libraries(
+        BLAS_LIBRARIES
+        BLAS
+        dgemm
+        ""
+        "Accelerate"
+        ""
+        ""
+        ""
+        )
+    endif()
   endif()
 endif()
 
 # Apple NAS (vecLib) library?
 if(BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
-  if(NOT BLAS_LIBRARIES)
-    check_blas_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      dgemm
-      ""
-      "vecLib"
-      ""
-      ""
-      ""
-      )
+  if(_blas_sizeof_integer EQUAL 8)
+    if(BLA_VENDOR STREQUAL "NAS")
+      message(FATAL_ERROR "Accelerate Framework does not support Int64 type")
+    endif()
+  else()
+    if(NOT BLAS_LIBRARIES)
+      check_blas_libraries(
+        BLAS_LIBRARIES
+        BLAS
+        dgemm
+        ""
+        "vecLib"
+        ""
+        ""
+        ""
+        )
+    endif()
   endif()
 endif()
 
 # Elbrus Math Library?
 if(BLA_VENDOR MATCHES "EML" OR BLA_VENDOR STREQUAL "All")
 
-   set(BLAS_EML_LIB "eml")
+  set(_blas_eml_lib "eml")
 
-   # Check for OpenMP support, VIA BLA_VENDOR of eml_mt
-   if(BLA_VENDOR MATCHES "_mt")
-     set(BLAS_EML_LIB "${BLAS_EML_LIB}_mt")
-   endif()
-
-   if(NOT BLAS_LIBRARIES)
-    check_blas_libraries(
-      BLAS_LIBRARIES
-      BLAS
-      sgemm
-      ""
-      "${BLAS_EML_LIB}"
-      ""
-      ""
-      ""
-      )
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_eml_lib "_ilp64")
+  endif()
+  # Check for OpenMP support, VIA BLA_VENDOR of eml_mt
+  if(BLA_VENDOR MATCHES "_mt")
+    string(APPEND _blas_eml_lib "_mt")
   endif()
 
-endif()
-
-# Fujitsu SSL2 Library?
-if(NOT BLAS_LIBRARIES
-    AND (BLA_VENDOR MATCHES "Fujitsu_SSL2" OR BLA_VENDOR STREQUAL "All"))
-  if(BLA_VENDOR STREQUAL "Fujitsu_SSL2BLAMP")
-    set(_ssl2_suffix BLAMP)
-  else()
-    set(_ssl2_suffix)
-  endif()
-  check_blas_libraries(
-    BLAS_LIBRARIES
-    BLAS
-    sgemm
-    "-SSL2${_ssl2_suffix}"
-    ""
-    ""
-    ""
-    ""
-    )
-  if(BLAS_LIBRARIES)
-    set(BLAS_LINKER_FLAGS "-SSL2${_ssl2_suffix}")
-    set(_blas_fphsa_req_var BLAS_LINKER_FLAGS)
-  endif()
-  unset(_ssl2_suffix)
-endif()
-
-# Generic BLAS library?
-if(BLA_VENDOR STREQUAL "Generic" OR
-   BLA_VENDOR STREQUAL "NVHPC" OR
-   BLA_VENDOR STREQUAL "All")
   if(NOT BLAS_LIBRARIES)
     check_blas_libraries(
       BLAS_LIBRARIES
       BLAS
       sgemm
       ""
-      "blas"
+      "${_blas_eml_lib}"
       ""
       ""
       ""
       )
   endif()
+  unset(_blas_eml_lib)
+endif()
+
+# Fujitsu SSL2 Library?
+if(NOT BLAS_LIBRARIES
+    AND (BLA_VENDOR MATCHES "^Fujitsu_SSL2" OR BLA_VENDOR STREQUAL "All"))
+  set(_blas_fjlapack_lib "fjlapack")
+  set(_blas_fjlapack_flags "-Kopenmp")
+
+  if(BLA_VENDOR MATCHES "BLAMP")
+    string(APPEND _blas_fjlapack_lib "ex")
+  endif()
+  if(BLA_VENDOR MATCHES "SVE")
+    string(APPEND _blas_fjlapack_lib "sve")
+  endif()
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_fjlapack_lib "_ilp64")
+  endif()
+
+  if(NOT BLAS_LIBRARIES)
+    check_blas_libraries(
+      BLAS_LIBRARIES
+      BLAS
+      sgemm
+      "${_blas_fjlapack_flags}"
+      "${_blas_fjlapack_lib}"
+      ""
+      ""
+      ""
+      )
+    if(BLAS_LIBRARIES)
+      set(BLAS_LINKER_FLAGS ${_blas_fjlapack_flags})
+    endif()
+  endif()
+
+  unset(_blas_fjlapack_flags)
+  unset(_blas_fjlapack_lib)
+endif()
+
+# BLAS in nVidia HPC SDK? (https://developer.nvidia.com/hpc-sdk)
+if(BLA_VENDOR STREQUAL "NVHPC" OR BLA_VENDOR STREQUAL "All")
+  set(_blas_nvhpc_lib "blas")
+
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_nvhpc_lib "_ilp64")
+  elseif(_blas_sizeof_integer EQUAL 4)
+    string(APPEND _blas_nvhpc_lib "_lp64")
+  endif()
+
+  if(NOT BLAS_LIBRARIES)
+    check_blas_libraries(
+      BLAS_LIBRARIES
+      BLAS
+      sgemm
+      ""
+      "${_blas_nvhpc_lib}"
+      ""
+      ""
+      ""
+      )
+  endif()
+
+  # an additional check for NVHPC 2020
+  # which does not have differentiation
+  # between lp64 and ilp64 modes
+  if(NOT BLAS_LIBRARIES AND NOT _blas_sizeof_integer EQUAL 8)
+    set(_blas_nvhpc_lib "blas")
+
+    check_blas_libraries(
+      BLAS_LIBRARIES
+      BLAS
+      sgemm
+      ""
+      "${_blas_nvhpc_lib}"
+      ""
+      ""
+      ""
+      )
+  endif()
+
+  unset(_blas_nvhpc_lib)
+endif()
+
+# Generic BLAS library?
+if(BLA_VENDOR STREQUAL "Generic" OR
+   BLA_VENDOR STREQUAL "All")
+  set(_blas_generic_lib "blas")
+
+  if(_blas_sizeof_integer EQUAL 8)
+    string(APPEND _blas_generic_lib "64")
+  endif()
+
+  if(NOT BLAS_LIBRARIES)
+    check_blas_libraries(
+      BLAS_LIBRARIES
+      BLAS
+      sgemm
+      ""
+      "${_blas_generic_lib}"
+      ""
+      ""
+      ""
+      )
+  endif()
+
+  unset(_blas_generic_lib)
 endif()
 
 # On compilers that implicitly link BLAS (i.e. CrayPrgEnv) we used a
@@ -1163,3 +1347,6 @@ if(NOT BLA_F95)
 endif()
 
 _add_blas_target()
+unset(_blas_fphsa_req_var)
+unset(_blas_sizeof_integer)
+unset(_BLAS_LIBRARIES)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindBZip2.cmake b/deps/cmake/share/cmake-3.25/Modules/FindBZip2.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindBZip2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindBZip2.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindBacktrace.cmake b/deps/cmake/share/cmake-3.25/Modules/FindBacktrace.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/FindBacktrace.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindBacktrace.cmake
index 3d8ce884..46b62d2e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindBacktrace.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindBacktrace.cmake
@@ -5,7 +5,7 @@
 FindBacktrace
 -------------
 
-Find provider for `backtrace(3) <http://man7.org/linux/man-pages/man3/backtrace.3.html>`__.
+Find provider for `backtrace(3) <https://man7.org/linux/man-pages/man3/backtrace.3.html>`__.
 
 Checks if OS supports ``backtrace(3)`` via either ``libc`` or custom library.
 This module defines the following variables:
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindBoost.cmake b/deps/cmake/share/cmake-3.25/Modules/FindBoost.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/FindBoost.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindBoost.cmake
index f7605c4f..0cea239a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindBoost.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindBoost.cmake
@@ -390,7 +390,7 @@ cmake_policy(SET CMP0102 NEW) # if mark_as_advanced(non_cache_var)
 
 function(_boost_get_existing_target component target_var)
   set(names "${component}")
-  if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$")
+  if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9]+)?$")
     # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc.
     list(APPEND names
       "${CMAKE_MATCH_1}${CMAKE_MATCH_2}" # python
@@ -407,7 +407,7 @@ function(_boost_get_existing_target component target_var)
       if(TARGET "${prefix}::${name}")
         # The target may be an INTERFACE library that wraps around a single other
         # target for compatibility.  Unwrap this layer so we can extract real info.
-        if("${name}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$")
+        if("${name}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9]+)$")
           set(name_nv "${CMAKE_MATCH_1}")
           if(TARGET "${prefix}::${name_nv}")
             get_property(type TARGET "${prefix}::${name}" PROPERTY TYPE)
@@ -430,7 +430,7 @@ endfunction()
 
 function(_boost_get_canonical_target_name component target_var)
   string(TOLOWER "${component}" component)
-  if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$")
+  if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9]+)?$")
     # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc.
     set(${target_var} "Boost::${CMAKE_MATCH_1}${CMAKE_MATCH_2}" PARENT_SCOPE)
   else()
@@ -917,14 +917,14 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret)
     if(NOT Boost_VERSION_STRING VERSION_LESS 1.69.0)
       # From GCC 5 and clang 4, versioning changes and minor becomes patch.
       # For those compilers, patch is exclude from compiler tag in Boost 1.69+ library naming.
-      if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND _boost_COMPILER_VERSION_MAJOR VERSION_GREATER 4)
+      if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND _boost_COMPILER_VERSION_MAJOR VERSION_GREATER 4) OR CMAKE_CXX_COMPILER_ID STREQUAL "LCC")
         set(_boost_COMPILER_VERSION "${_boost_COMPILER_VERSION_MAJOR}")
       elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND _boost_COMPILER_VERSION_MAJOR VERSION_GREATER 3)
         set(_boost_COMPILER_VERSION "${_boost_COMPILER_VERSION_MAJOR}")
       endif()
     endif()
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "LCC")
       if(Boost_VERSION_STRING VERSION_LESS 1.34)
         set(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
       else()
@@ -1004,7 +1004,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
   # against the new release.
 
   # Handle Python version suffixes
-  if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$")
+  if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9]+)\$")
     set(component "${CMAKE_MATCH_1}")
     set(component_python_version "${CMAKE_MATCH_2}")
   endif()
@@ -1335,7 +1335,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
       set(_Boost_TIMER_DEPENDENCIES chrono)
       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-    else()
+    elseif(Boost_VERSION_STRING VERSION_LESS 1.77.0)
       set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time)
       set(_Boost_COROUTINE_DEPENDENCIES context)
       set(_Boost_FIBER_DEPENDENCIES context)
@@ -1350,7 +1350,37 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
       set(_Boost_TIMER_DEPENDENCIES chrono)
       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
+    elseif(Boost_VERSION_STRING VERSION_LESS 1.78.0)
+      set(_Boost_CONTRACT_DEPENDENCIES thread chrono)
+      set(_Boost_COROUTINE_DEPENDENCIES context)
+      set(_Boost_FIBER_DEPENDENCIES context)
+      set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+      set(_Boost_JSON_DEPENDENCIES container)
+      set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono atomic)
+      set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l)
+      set(_Boost_MPI_DEPENDENCIES serialization)
+      set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
+      set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
+      set(_Boost_THREAD_DEPENDENCIES chrono atomic)
+      set(_Boost_TIMER_DEPENDENCIES chrono)
+      set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
+      set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+    else()
+      set(_Boost_CONTRACT_DEPENDENCIES thread chrono)
+      set(_Boost_COROUTINE_DEPENDENCIES context)
+      set(_Boost_FIBER_DEPENDENCIES context)
+      set(_Boost_IOSTREAMS_DEPENDENCIES regex)
+      set(_Boost_JSON_DEPENDENCIES container)
+      set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic)
+      set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l)
+      set(_Boost_MPI_DEPENDENCIES serialization)
+      set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
+      set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
+      set(_Boost_THREAD_DEPENDENCIES chrono atomic)
+      set(_Boost_TIMER_DEPENDENCIES chrono)
+      set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic)
+      set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.81.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
         message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
       endif()
     endif()
@@ -1378,7 +1408,7 @@ endfunction()
 #
 function(_Boost_COMPONENT_HEADERS component _hdrs)
   # Handle Python version suffixes
-  if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$")
+  if(component MATCHES "^(python|mpi_python|numpy)([0-9]+|[0-9]\\.[0-9]+)\$")
     set(component "${CMAKE_MATCH_1}")
     set(component_python_version "${CMAKE_MATCH_2}")
   endif()
@@ -1623,7 +1653,8 @@ else()
   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
   # _Boost_COMPONENT_DEPENDENCIES.
   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-    "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
+    "1.80.0" "1.80" "1.79.0" "1.79"
+    "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
     "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
     "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
@@ -2135,7 +2166,7 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
   if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$")
     set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
     set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
-  elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$")
+  elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9]+)\$")
     set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
     set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
     set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindBullet.cmake b/deps/cmake/share/cmake-3.25/Modules/FindBullet.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindBullet.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindBullet.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCABLE.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCABLE.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCABLE.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCABLE.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCUDA.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCUDA.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindCUDA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCUDA.cmake
index dd795f44..c9281574 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindCUDA.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindCUDA.cmake
@@ -799,7 +799,9 @@ if(NOT "${CUDA_TOOLKIT_ROOT_DIR}" STREQUAL "${CUDA_TOOLKIT_ROOT_DIR_INTERNAL}")
   unset(CUDA_VERSION CACHE)
 endif()
 
-if(NOT "${CUDA_TOOLKIT_TARGET_DIR}" STREQUAL "${CUDA_TOOLKIT_TARGET_DIR_INTERNAL}")
+# If CUDA_TOOLKIT_TARGET_DIR exists, check if it has changed.
+if(DEFINED CUDA_TOOLKIT_TARGET_DIR
+    AND NOT "${CUDA_TOOLKIT_TARGET_DIR}" STREQUAL "${CUDA_TOOLKIT_TARGET_DIR_INTERNAL}")
   cuda_unset_include_and_libraries()
 endif()
 
@@ -926,8 +928,8 @@ mark_as_advanced(CUDA_NVCC_EXECUTABLE)
 if(CUDA_NVCC_EXECUTABLE AND NOT CUDA_VERSION)
   # Compute the version.
   execute_process (COMMAND ${CUDA_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT)
-  string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR ${NVCC_OUT})
-  string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR ${NVCC_OUT})
+  string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\1" CUDA_VERSION_MAJOR "${NVCC_OUT}")
+  string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR "${NVCC_OUT}")
   set(CUDA_VERSION "${CUDA_VERSION_MAJOR}.${CUDA_VERSION_MINOR}" CACHE STRING "Version of CUDA as computed from nvcc.")
   mark_as_advanced(CUDA_VERSION)
 else()
@@ -1148,8 +1150,10 @@ if(NOT CUDA_VERSION VERSION_LESS "9.0")
   find_cuda_helper_libs(nppc)
   find_cuda_helper_libs(nppial)
   find_cuda_helper_libs(nppicc)
+  set(CUDA_npp_LIBRARY ${CUDA_nppc_LIBRARY} ${CUDA_nppial_LIBRARY} ${CUDA_nppicc_LIBRARY})
   if(CUDA_VERSION VERSION_LESS "11.0")
     find_cuda_helper_libs(nppicom)
+    list(APPEND CUDA_npp_LIBRARY ${CUDA_nppicom_LIBRARY})
   endif()
   find_cuda_helper_libs(nppidei)
   find_cuda_helper_libs(nppif)
@@ -1159,7 +1163,7 @@ if(NOT CUDA_VERSION VERSION_LESS "9.0")
   find_cuda_helper_libs(nppisu)
   find_cuda_helper_libs(nppitc)
   find_cuda_helper_libs(npps)
-  set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY};${CUDA_npps_LIBRARY}")
+  list(APPEND CUDA_npp_LIBRARY ${CUDA_nppidei_LIBRARY} ${CUDA_nppif_LIBRARY} ${CUDA_nppig_LIBRARY} ${CUDA_nppim_LIBRARY} ${CUDA_nppist_LIBRARY} ${CUDA_nppisu_LIBRARY} ${CUDA_nppitc_LIBRARY} ${CUDA_npps_LIBRARY})
 elseif(CUDA_VERSION VERSION_GREATER "5.0")
   # In CUDA 5.5 NPP was split into 3 separate libraries.
   find_cuda_helper_libs(nppc)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCUDA/make2cmake.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCUDA/make2cmake.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCUDA/make2cmake.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCUDA/make2cmake.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCUDA/parse_cubin.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCUDA/parse_cubin.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCUDA/parse_cubin.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCUDA/parse_cubin.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCUDA/run_nvcc.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCUDA/run_nvcc.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCUDA/run_nvcc.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCUDA/run_nvcc.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCUDA/select_compute_arch.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCUDA/select_compute_arch.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindCUDA/select_compute_arch.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCUDA/select_compute_arch.cmake
index a35b3f8f..5fad3370 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindCUDA/select_compute_arch.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindCUDA/select_compute_arch.cmake
@@ -135,10 +135,10 @@ function(CUDA_DETECT_INSTALLED_GPUS OUT_VARIABLE)
       "}\n")
 
     if(CMAKE_CUDA_COMPILER_LOADED) # CUDA as a language
-      try_run(run_result compile_result ${PROJECT_BINARY_DIR} ${file}
+      try_run(run_result compile_result SOURCES ${file}
               RUN_OUTPUT_VARIABLE compute_capabilities)
     else()
-      try_run(run_result compile_result ${PROJECT_BINARY_DIR} ${file}
+      try_run(run_result compile_result SOURCES ${file}
               CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CUDA_INCLUDE_DIRS}"
               LINK_LIBRARIES ${CUDA_LIBRARIES}
               RUN_OUTPUT_VARIABLE compute_capabilities)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCUDAToolkit.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCUDAToolkit.cmake
similarity index 77%
rename from deps/cmake/share/cmake-3.21/Modules/FindCUDAToolkit.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCUDAToolkit.cmake
index 89b8c997..f06f0e88 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindCUDAToolkit.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindCUDAToolkit.cmake
@@ -109,6 +109,7 @@ of the following libraries that are part of the CUDAToolkit:
 - :ref:`CUDA Runtime Library<cuda_toolkit_rt_lib>`
 - :ref:`CUDA Driver Library<cuda_toolkit_driver_lib>`
 - :ref:`cuBLAS<cuda_toolkit_cuBLAS>`
+- :ref:`cuFile<cuda_toolkit_cuFile>`
 - :ref:`cuFFT<cuda_toolkit_cuFFT>`
 - :ref:`cuRAND<cuda_toolkit_cuRAND>`
 - :ref:`cuSOLVER<cuda_toolkit_cuSOLVER>`
@@ -119,8 +120,10 @@ of the following libraries that are part of the CUDAToolkit:
 - :ref:`nvGRAPH<cuda_toolkit_nvGRAPH>`
 - :ref:`nvJPEG<cuda_toolkit_nvJPEG>`
 - :ref:`nvidia-ML<cuda_toolkit_nvML>`
+- :ref:`nvPTX Compiler<cuda_toolkit_nvptx>`
 - :ref:`nvRTC<cuda_toolkit_nvRTC>`
 - :ref:`nvToolsExt<cuda_toolkit_nvToolsExt>`
+- :ref:`nvtx3<cuda_toolkit_nvtx3>`
 - :ref:`OpenCL<cuda_toolkit_opencl>`
 - :ref:`cuLIBOS<cuda_toolkit_cuLIBOS>`
 
@@ -143,12 +146,10 @@ CUDA Driver Library
 """"""""""""""""""""
 
 The CUDA Driver library (cuda) are used by applications that use calls
-such as `cuMemAlloc`, and `cuMemFree`. This is generally used by advanced
-
+such as `cuMemAlloc`, and `cuMemFree`.
 
 Targets Created:
 
-- ``CUDA::cuda_driver``
 - ``CUDA::cuda_driver``
 
 .. _`cuda_toolkit_cuBLAS`:
@@ -165,6 +166,22 @@ Targets Created:
 - ``CUDA::cublasLt`` starting in CUDA 10.1
 - ``CUDA::cublasLt_static`` starting in CUDA 10.1
 
+.. _`cuda_toolkit_cuFile`:
+
+cuFile
+""""""
+
+.. versionadded:: 3.25
+
+The NVIDIA GPUDirect Storage `cuFile <https://docs.nvidia.com/cuda/cufile-api/index.html>`_ library.
+
+Targets Created:
+
+- ``CUDA::cuFile`` starting in CUDA 11.4
+- ``CUDA::cuFile_static`` starting in CUDA 11.4
+- ``CUDA::cuFile_rdma`` starting in CUDA 11.4
+- ``CUDA::cuFile_rdma_static`` starting in CUDA 11.4
+
 .. _`cuda_toolkit_cuFFT`:
 
 cuFFT
@@ -177,6 +194,7 @@ Targets Created:
 - ``CUDA::cufft``
 - ``CUDA::cufftw``
 - ``CUDA::cufft_static``
+- ``CUDA::cufft_static_nocallback`` starting in CUDA 9.2, requires CMake 3.23+
 - ``CUDA::cufftw_static``
 
 cuRAND
@@ -334,6 +352,22 @@ Targets Created:
 - ``CUDA::nvjpeg``
 - ``CUDA::nvjpeg_static``
 
+.. _`cuda_toolkit_nvPTX`:
+
+nvPTX Compiler
+""""""""""""""
+
+.. versionadded:: 3.25
+
+The `nvPTX <https://docs.nvidia.com/cuda/ptx-compiler-api/index.html>`_ (PTX Compilation) library.
+The PTX Compiler APIs are a set of APIs which can be used to compile a PTX program into GPU assembly code.
+Introduced in CUDA 11.1
+This is a static library only.
+
+Targets Created:
+
+- ``CUDA::nvptxcompiler_static`` starting in CUDA 11.1
+
 .. _`cuda_toolkit_nvRTC`:
 
 nvRTC
@@ -363,6 +397,8 @@ Targets Created:
 nvToolsExt
 """"""""""
 
+.. deprecated:: 3.25 With CUDA 10.0+, use :ref:`nvtx3 <cuda_toolkit_nvtx3>`.
+
 The `NVIDIA Tools Extension <https://docs.nvidia.com/gameworks/content/gameworkslibrary/nvtx/nvidia_tools_extension_library_nvtx.htm>`_.
 This is a shared library only.
 
@@ -370,6 +406,20 @@ Targets Created:
 
 - ``CUDA::nvToolsExt``
 
+.. _`cuda_toolkit_nvtx3`:
+
+nvtx3
+"""""
+
+.. versionadded:: 3.25
+
+The header-only `NVIDIA Tools Extension Library <https://nvidia.github.io/NVTX/doxygen/index.html>`_.
+Introduced in CUDA 10.0.
+
+Targets created:
+
+- ``CUDA::nvtx3``
+
 .. _`cuda_toolkit_opencl`:
 
 OpenCL
@@ -500,12 +550,17 @@ if(CMAKE_CUDA_COMPILER_TOOLKIT_ROOT)
   set(CUDAToolkit_LIBRARY_ROOT "${CMAKE_CUDA_COMPILER_LIBRARY_ROOT}")
   set(CUDAToolkit_BIN_DIR "${CUDAToolkit_ROOT_DIR}/bin")
   set(CUDAToolkit_NVCC_EXECUTABLE "${CUDAToolkit_BIN_DIR}/nvcc${CMAKE_EXECUTABLE_SUFFIX}")
-else()
+  set(CUDAToolkit_VERSION "${CMAKE_CUDA_COMPILER_TOOLKIT_VERSION}")
 
+  if(CUDAToolkit_VERSION MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=])
+    set(CUDAToolkit_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    set(CUDAToolkit_VERSION_MINOR "${CMAKE_MATCH_2}")
+    set(CUDAToolkit_VERSION_PATCH "${CMAKE_MATCH_3}")
+  endif()
+else()
   function(_CUDAToolkit_find_root_dir )
     cmake_parse_arguments(arg "" "" "SEARCH_PATHS;FIND_FLAGS" ${ARGN})
 
-
     if(NOT CUDAToolkit_BIN_DIR)
       if(NOT CUDAToolkit_SENTINEL_FILE)
         find_program(CUDAToolkit_NVCC_EXECUTABLE
@@ -688,6 +743,40 @@ else()
     get_filename_component(CUDAToolkit_LIBRARY_ROOT "${_CUDAToolkit_version_file}" DIRECTORY ABSOLUTE)
   endif()
   unset(_CUDAToolkit_version_file)
+
+  if(CUDAToolkit_NVCC_EXECUTABLE AND
+     CMAKE_CUDA_COMPILER_VERSION AND
+     CUDAToolkit_NVCC_EXECUTABLE STREQUAL CMAKE_CUDA_COMPILER)
+    # Need to set these based off the already computed CMAKE_CUDA_COMPILER_VERSION value
+    # This if statement will always match, but is used to provide variables for MATCH 1,2,3...
+    if(CMAKE_CUDA_COMPILER_VERSION MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=])
+      set(CUDAToolkit_VERSION_MAJOR "${CMAKE_MATCH_1}")
+      set(CUDAToolkit_VERSION_MINOR "${CMAKE_MATCH_2}")
+      set(CUDAToolkit_VERSION_PATCH "${CMAKE_MATCH_3}")
+      set(CUDAToolkit_VERSION "${CMAKE_CUDA_COMPILER_VERSION}")
+    endif()
+  elseif(CUDAToolkit_NVCC_EXECUTABLE)
+    # Compute the version by invoking nvcc
+    execute_process(COMMAND ${CUDAToolkit_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT)
+    if(NVCC_OUT MATCHES [=[ V([0-9]+)\.([0-9]+)\.([0-9]+)]=])
+      set(CUDAToolkit_VERSION_MAJOR "${CMAKE_MATCH_1}")
+      set(CUDAToolkit_VERSION_MINOR "${CMAKE_MATCH_2}")
+      set(CUDAToolkit_VERSION_PATCH "${CMAKE_MATCH_3}")
+      set(CUDAToolkit_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+    endif()
+    unset(NVCC_OUT)
+  else()
+    _CUDAToolkit_find_version_file(version_file)
+    if(version_file)
+      file(READ "${version_file}" VERSION_INFO)
+      if(VERSION_INFO MATCHES [=[CUDA Version ([0-9]+)\.([0-9]+)\.([0-9]+)]=])
+        set(CUDAToolkit_VERSION_MAJOR "${CMAKE_MATCH_1}")
+        set(CUDAToolkit_VERSION_MINOR "${CMAKE_MATCH_2}")
+        set(CUDAToolkit_VERSION_PATCH "${CMAKE_MATCH_3}")
+        set(CUDAToolkit_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+      endif()
+    endif()
+  endif()
 endif()
 
 # Find target directory when crosscompiling.
@@ -742,37 +831,16 @@ elseif(NOT CUDAToolkit_FIND_QUIETLY)
   message(STATUS "Unable to find cuda_runtime.h in \"${CUDAToolkit_TARGET_DIR}/include\" for CUDAToolkit_INCLUDE_DIR.")
 endif()
 
-if(CUDAToolkit_NVCC_EXECUTABLE AND
-   CMAKE_CUDA_COMPILER_VERSION AND
-   CUDAToolkit_NVCC_EXECUTABLE STREQUAL CMAKE_CUDA_COMPILER)
-  # Need to set these based off the already computed CMAKE_CUDA_COMPILER_VERSION value
-  # This if statement will always match, but is used to provide variables for MATCH 1,2,3...
-  if(CMAKE_CUDA_COMPILER_VERSION MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=])
-    set(CUDAToolkit_VERSION_MAJOR "${CMAKE_MATCH_1}")
-    set(CUDAToolkit_VERSION_MINOR "${CMAKE_MATCH_2}")
-    set(CUDAToolkit_VERSION_PATCH "${CMAKE_MATCH_3}")
-    set(CUDAToolkit_VERSION "${CMAKE_CUDA_COMPILER_VERSION}")
-  endif()
-elseif(CUDAToolkit_NVCC_EXECUTABLE)
-  # Compute the version by invoking nvcc
-  execute_process(COMMAND ${CUDAToolkit_NVCC_EXECUTABLE} "--version" OUTPUT_VARIABLE NVCC_OUT)
-  if(NVCC_OUT MATCHES [=[ V([0-9]+)\.([0-9]+)\.([0-9]+)]=])
-    set(CUDAToolkit_VERSION_MAJOR "${CMAKE_MATCH_1}")
-    set(CUDAToolkit_VERSION_MINOR "${CMAKE_MATCH_2}")
-    set(CUDAToolkit_VERSION_PATCH "${CMAKE_MATCH_3}")
-    set(CUDAToolkit_VERSION  "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
-  endif()
-  unset(NVCC_OUT)
-else()
-  _CUDAToolkit_find_version_file(version_file)
-  if(version_file)
-    file(READ "${version_file}" VERSION_INFO)
-    if(VERSION_INFO MATCHES [=[CUDA Version ([0-9]+)\.([0-9]+)\.([0-9]+)]=])
-      set(CUDAToolkit_VERSION_MAJOR "${CMAKE_MATCH_1}")
-      set(CUDAToolkit_VERSION_MINOR "${CMAKE_MATCH_2}")
-      set(CUDAToolkit_VERSION_PATCH "${CMAKE_MATCH_3}")
-      set(CUDAToolkit_VERSION  "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
+# The NVHPC layout moves math library headers and libraries to a sibling directory.
+# Create a separate variable so this directory can be selectively added to math targets.
+if(NOT EXISTS "${CUDAToolkit_INCLUDE_DIR}/cublas_v2.h")
+  set(CUDAToolkit_MATH_INCLUDE_DIR "${CUDAToolkit_TARGET_DIR}/../../math_libs/include")
+  cmake_path(NORMAL_PATH CUDAToolkit_MATH_INCLUDE_DIR)
+  if(NOT EXISTS "${CUDAToolkit_MATH_INCLUDE_DIR}/cublas_v2.h")
+    if(NOT CUDAToolkit_FIND_QUIETLY)
+      message(STATUS "Unable to find cublas_v2.h in either \"${CUDAToolkit_INCLUDE_DIR}\" or \"${CUDAToolkit_MATH_INCLUDE_DIR}\"")
     endif()
+    unset(CUDAToolkit_MATH_INCLUDE_DIR)
   endif()
 endif()
 
@@ -826,7 +894,7 @@ endif()
 if(CUDAToolkit_FOUND)
 
   function(_CUDAToolkit_find_and_add_import_lib lib_name)
-    cmake_parse_arguments(arg "" "" "ALT;DEPS;EXTRA_PATH_SUFFIXES" ${ARGN})
+    cmake_parse_arguments(arg "" "" "ALT;DEPS;EXTRA_PATH_SUFFIXES;EXTRA_INCLUDE_DIRS" ${ARGN})
 
     set(search_names ${lib_name} ${arg_ALT})
 
@@ -844,19 +912,31 @@ if(CUDAToolkit_FOUND)
       HINTS ${CUDAToolkit_LIBRARY_DIR}
             ENV CUDA_PATH
       PATH_SUFFIXES lib64/stubs lib/x64/stubs lib/stubs stubs
+                    # Support NVHPC splayed math library layout
+                    ../../math_libs/${CUDAToolkit_VERSION_MAJOR}.${CUDAToolkit_VERSION_MINOR}/lib64
+                    ../../math_libs/lib64
     )
 
     mark_as_advanced(CUDA_${lib_name}_LIBRARY)
 
     if (NOT TARGET CUDA::${lib_name} AND CUDA_${lib_name}_LIBRARY)
-      add_library(CUDA::${lib_name} IMPORTED INTERFACE)
+      add_library(CUDA::${lib_name} UNKNOWN IMPORTED)
       target_include_directories(CUDA::${lib_name} SYSTEM INTERFACE "${CUDAToolkit_INCLUDE_DIRS}")
-      target_link_libraries(CUDA::${lib_name} INTERFACE "${CUDA_${lib_name}_LIBRARY}")
+      if(DEFINED CUDAToolkit_MATH_INCLUDE_DIR)
+        string(FIND ${CUDA_${lib_name}_LIBRARY} "math_libs" math_libs)
+        if(NOT ${math_libs} EQUAL -1)
+          target_include_directories(CUDA::${lib_name} SYSTEM INTERFACE "${CUDAToolkit_MATH_INCLUDE_DIR}")
+        endif()
+      endif()
+      set_property(TARGET CUDA::${lib_name} PROPERTY IMPORTED_LOCATION "${CUDA_${lib_name}_LIBRARY}")
       foreach(dep ${arg_DEPS})
         if(TARGET CUDA::${dep})
           target_link_libraries(CUDA::${lib_name} INTERFACE CUDA::${dep})
         endif()
       endforeach()
+      if(arg_EXTRA_INCLUDE_DIRS)
+        target_include_directories(CUDA::${lib_name} SYSTEM INTERFACE "${arg_EXTRA_INCLUDE_DIRS}")
+      endif()
     endif()
   endfunction()
 
@@ -898,18 +978,56 @@ if(CUDAToolkit_FOUND)
   endif()
 
   _CUDAToolkit_find_and_add_import_lib(culibos) # it's a static library
-  foreach (cuda_lib cublasLt cublas cufft curand cusparse nppc nvjpeg)
+  foreach (cuda_lib cublasLt cufft curand cusparse nppc nvjpeg)
     _CUDAToolkit_find_and_add_import_lib(${cuda_lib})
     _CUDAToolkit_find_and_add_import_lib(${cuda_lib}_static DEPS culibos)
   endforeach()
 
+  if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 11.0.0)
+    # cublas depends on cublasLt
+    # https://docs.nvidia.com/cuda/archive/11.0/cublas/index.html#static-library
+    _CUDAToolkit_find_and_add_import_lib(cublas DEPS cublasLt culibos)
+    _CUDAToolkit_find_and_add_import_lib(cublas_static DEPS cublasLt_static culibos)
+  else()
+    _CUDAToolkit_find_and_add_import_lib(cublas DEPS culibos)
+    _CUDAToolkit_find_and_add_import_lib(cublas_static DEPS culibos)
+  endif()
+
+  if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 11.4)
+    _CUDAToolkit_find_and_add_import_lib(cuFile DEPS culibos)
+    _CUDAToolkit_find_and_add_import_lib(cuFile_static DEPS culibos)
+
+    _CUDAToolkit_find_and_add_import_lib(cuFile_rdma DEPS cuFile culibos)
+    _CUDAToolkit_find_and_add_import_lib(cuFile_rdma_static DEPS cuFile_static culibos)
+  endif()
+
   # cuFFTW depends on cuFFT
   _CUDAToolkit_find_and_add_import_lib(cufftw DEPS cufft)
-  _CUDAToolkit_find_and_add_import_lib(cufftw DEPS cufft_static)
+  _CUDAToolkit_find_and_add_import_lib(cufftw_static DEPS cufft_static)
+  if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 9.2)
+    _CUDAToolkit_find_and_add_import_lib(cufft_static_nocallback DEPS culibos)
+  endif()
 
   # cuSOLVER depends on cuBLAS, and cuSPARSE
-  _CUDAToolkit_find_and_add_import_lib(cusolver DEPS cublas cusparse)
-  _CUDAToolkit_find_and_add_import_lib(cusolver_static DEPS cublas_static cusparse_static culibos)
+  set(cusolver_deps cublas cusparse)
+  set(cusolver_static_deps cublas_static cusparse_static culibos)
+  if(CUDAToolkit_VERSION VERSION_GREATER 11.2.1)
+    # cusolver depends on libcusolver_metis and cublasLt
+    # https://docs.nvidia.com/cuda/archive/11.2.2/cusolver/index.html#link-dependency
+    list(APPEND cusolver_deps cublasLt)
+    _CUDAToolkit_find_and_add_import_lib(cusolver_metis_static ALT metis_static) # implementation detail static lib
+    list(APPEND cusolver_static_deps cusolver_metis_static cublasLt_static)
+  endif()
+  if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 10.1.2)
+    # cusolver depends on liblapack_static.a starting with CUDA 10.1 update 2,
+    # https://docs.nvidia.com/cuda/archive/11.5.0/cusolver/index.html#static-link-lapack
+    _CUDAToolkit_find_and_add_import_lib(cusolver_lapack_static ALT lapack_static) # implementation detail static lib
+    list(APPEND cusolver_static_deps cusolver_lapack_static)
+  endif()
+  _CUDAToolkit_find_and_add_import_lib(cusolver DEPS ${cusolver_deps})
+  _CUDAToolkit_find_and_add_import_lib(cusolver_static DEPS ${cusolver_static_deps})
+  unset(cusolver_deps)
+  unset(cusolver_static_deps)
 
   # nvGRAPH depends on cuRAND, and cuSOLVER.
   _CUDAToolkit_find_and_add_import_lib(nvgraph DEPS curand cusolver)
@@ -921,14 +1039,32 @@ if(CUDAToolkit_FOUND)
     _CUDAToolkit_find_and_add_import_lib(${cuda_lib}_static DEPS nppc_static)
   endforeach()
 
-  _CUDAToolkit_find_and_add_import_lib(cupti
-                                       EXTRA_PATH_SUFFIXES ../extras/CUPTI/lib64/
-                                                           ../extras/CUPTI/lib/)
-  _CUDAToolkit_find_and_add_import_lib(cupti_static
-                                       EXTRA_PATH_SUFFIXES ../extras/CUPTI/lib64/
-                                                           ../extras/CUPTI/lib/)
+  find_path(CUDAToolkit_CUPTI_INCLUDE_DIR cupti.h PATHS
+      "${CUDAToolkit_ROOT_DIR}/extras/CUPTI/include"
+      "${CUDAToolkit_INCLUDE_DIR}/../extras/CUPTI/include"
+      "${CUDAToolkit_INCLUDE_DIR}"
+      NO_DEFAULT_PATH)
+
+  if(CUDAToolkit_CUPTI_INCLUDE_DIR)
+    _CUDAToolkit_find_and_add_import_lib(cupti
+                                        EXTRA_PATH_SUFFIXES ../extras/CUPTI/lib64/
+                                                            ../extras/CUPTI/lib/
+                                        EXTRA_INCLUDE_DIRS "${CUDAToolkit_CUPTI_INCLUDE_DIR}")
+    _CUDAToolkit_find_and_add_import_lib(cupti_static
+                                        EXTRA_PATH_SUFFIXES ../extras/CUPTI/lib64/
+                                                            ../extras/CUPTI/lib/
+                                        EXTRA_INCLUDE_DIRS "${CUDAToolkit_CUPTI_INCLUDE_DIR}")
+  endif()
 
   _CUDAToolkit_find_and_add_import_lib(nvrtc DEPS cuda_driver)
+  if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 11.1.0)
+    if(NOT TARGET CUDA::nvptxcompiler_static)
+      _CUDAToolkit_find_and_add_import_lib(nvptxcompiler_static DEPS cuda_driver)
+      if(TARGET CUDA::nvptxcompiler_static)
+        target_link_libraries(CUDA::nvptxcompiler_static INTERFACE Threads::Threads)
+      endif()
+    endif()
+  endif()
 
   _CUDAToolkit_find_and_add_import_lib(nvml ALT nvidia-ml nvml)
 
@@ -945,6 +1081,21 @@ if(CUDAToolkit_FOUND)
   endif()
   _CUDAToolkit_find_and_add_import_lib(nvToolsExt ALT nvToolsExt64)
 
+  if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 10.0)
+    # nvToolsExt is deprecated since nvtx3 introduction.
+    # Warn only if the project requires a sufficiently new CMake to make migration possible.
+    if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_GREATER_EQUAL 3.25)
+      set_property(TARGET CUDA::nvToolsExt PROPERTY DEPRECATION "nvToolsExt has been superseded by nvtx3 since CUDA 10.0 and CMake 3.25. Use CUDA::nvtx3 and include <nvtx3/nvToolsExt.h> instead.")
+    endif()
+
+    # Header-only variant. Uses dlopen().
+    if(NOT TARGET CUDA::nvtx3)
+      add_library(CUDA::nvtx3 INTERFACE IMPORTED)
+      target_include_directories(CUDA::nvtx3 SYSTEM INTERFACE "${CUDAToolkit_INCLUDE_DIRS}")
+      target_link_libraries(CUDA::nvtx3 INTERFACE ${CMAKE_DL_LIBS})
+    endif()
+  endif()
+
   _CUDAToolkit_find_and_add_import_lib(OpenCL)
 endif()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCURL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCURL.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindCURL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCURL.cmake
index e37d2259..acb87dc6 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindCURL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindCURL.cmake
@@ -72,6 +72,8 @@ if(NOT CURL_NO_CURL_CMAKE)
   # can print what we found and return.
   if(CURL_FOUND)
     find_package_handle_standard_args(CURL HANDLE_COMPONENTS CONFIG_MODE)
+    # The upstream curl package sets CURL_VERSION, not CURL_VERSION_STRING.
+    set(CURL_VERSION_STRING "${CURL_VERSION}")
     return()
   endif()
 endif()
@@ -80,7 +82,6 @@ find_package(PkgConfig QUIET)
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_CURL QUIET libcurl)
   if(PC_CURL_FOUND)
-    set(CURL_VERSION_STRING ${PC_CURL_VERSION})
     pkg_get_variable(CURL_SUPPORTED_PROTOCOLS libcurl supported_protocols)
     pkg_get_variable(CURL_SUPPORTED_FEATURES libcurl supported_features)
   endif()
@@ -120,7 +121,7 @@ if(NOT CURL_LIBRARY)
   select_library_configurations(CURL)
 endif()
 
-if(CURL_INCLUDE_DIR AND NOT CURL_VERSION_STRING)
+if(CURL_INCLUDE_DIR)
   foreach(_curl_version_header curlver.h curl.h)
     if(EXISTS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}")
       file(STRINGS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"")
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCVS.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCVS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCVS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCVS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCoin3D.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCoin3D.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindCoin3D.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCoin3D.cmake
index 301e70bd..5910ad1e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindCoin3D.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindCoin3D.cmake
@@ -31,11 +31,11 @@ if (WIN32)
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\Coin3D\\2;Installation Path]/include"
     )
 
-    find_library(COIN3D_LIBRARY_DEBUG coin2d
+    find_library(COIN3D_LIBRARY_DEBUG NAMES coin2d coin4d
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\Coin3D\\2;Installation Path]/lib"
     )
 
-    find_library(COIN3D_LIBRARY_RELEASE coin2
+    find_library(COIN3D_LIBRARY_RELEASE NAMES coin2 coin4
       "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\Coin3D\\2;Installation Path]/lib"
     )
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCups.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCups.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCups.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCups.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCurses.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCurses.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCurses.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCurses.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCxxTest.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCxxTest.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindCxxTest.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCxxTest.cmake
index 3fc0e938..04f8b594 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindCxxTest.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindCxxTest.cmake
@@ -9,7 +9,7 @@ Find CxxTest unit testing framework.
 
 Find the CxxTest suite and declare a helper macro for creating unit
 tests and integrating them with CTest.  For more details on CxxTest
-see http://cxxtest.tigris.org
+see https://cxxtest.com
 
 INPUT Variables
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindCygwin.cmake b/deps/cmake/share/cmake-3.25/Modules/FindCygwin.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindCygwin.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindCygwin.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindDCMTK.cmake b/deps/cmake/share/cmake-3.25/Modules/FindDCMTK.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/FindDCMTK.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindDCMTK.cmake
index b2e00dff..0154a059 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindDCMTK.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindDCMTK.cmake
@@ -18,15 +18,16 @@ Compatibility
 ^^^^^^^^^^^^^
 
 This module is able to find a version of DCMTK that does or does not export
-a *DCMTKConfig.cmake* file. It applies a two step process:
+a ``DCMTKConfig.cmake`` file. It applies a two step process:
 
-* Step 1:  Attempt to find DCMTK version providing a *DCMTKConfig.cmake* file.
-* Step 2:  If step 1 failed, rely on *FindDCMTK.cmake* to set `DCMTK_*` variables details below.
+* Step 1:  Attempt to find DCMTK version providing a ``DCMTKConfig.cmake`` file.
+* Step 2:  If step 1 failed, rely on ``FindDCMTK.cmake`` to set ``DCMTK_*``
+  variables details below.
 
 
 `Recent DCMTK
-<http://git.dcmtk.org/web?p=dcmtk.git;a=commit;h=662ae187c493c6b9a73dd5e3875372cebd0c11fe>`_
-provides a *DCMTKConfig.cmake* :manual:`package configuration file
+<https://git.dcmtk.org/?p=dcmtk.git;a=commit;h=662ae187c493c6b9a73dd5e3875372cebd0c11fe>`_
+provides a ``DCMTKConfig.cmake`` :manual:`package configuration file
 <cmake-packages(7)>`. To exclusively use the package configuration file
 (recommended when possible), pass the `NO_MODULE` option to
 :command:`find_package`. For example, `find_package(DCMTK NO_MODULE)`.
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindDart.cmake b/deps/cmake/share/cmake-3.25/Modules/FindDart.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindDart.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindDart.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindDevIL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindDevIL.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindDevIL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindDevIL.cmake
index c8e5e315..7f726ffa 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindDevIL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindDevIL.cmake
@@ -8,7 +8,7 @@ FindDevIL
 
 
 This module locates the developer's image library.
-http://openil.sourceforge.net/
+https://openil.sourceforge.net/
 
 IMPORTED Targets
 ^^^^^^^^^^^^^^^^
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindDoxygen.cmake b/deps/cmake/share/cmake-3.25/Modules/FindDoxygen.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindDoxygen.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindDoxygen.cmake
index 4a16e316..ef9801eb 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindDoxygen.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindDoxygen.cmake
@@ -5,14 +5,14 @@
 FindDoxygen
 -----------
 
-Doxygen is a documentation generation tool (see http://www.doxygen.org).
+Doxygen is a documentation generation tool (see https://www.doxygen.nl).
 This module looks for Doxygen and some optional tools it supports:
 
 ``dot``
-  `Graphviz <http://graphviz.org>`_ ``dot`` utility used to render various
+  `Graphviz <https://graphviz.org>`_ ``dot`` utility used to render various
   graphs.
 ``mscgen``
-  `Message Chart Generator <http://www.mcternan.me.uk/mscgen/>`_ utility used
+  `Message Chart Generator <https://www.mcternan.me.uk/mscgen/>`_ utility used
   by Doxygen's ``\msc`` and ``\mscfile`` commands.
 ``dia``
   `Dia <https://wiki.gnome.org/Apps/Dia>`_ the diagram editor used by Doxygen's
@@ -91,7 +91,7 @@ Functions
   base point. Note also that Doxygen's default behavior is to strip the working
   directory from relative paths in the generated documentation (see the
   ``STRIP_FROM_PATH`` `Doxygen config option
-  <http://www.doxygen.org/manual/config.html>`_ for details).
+  <https://www.doxygen.nl/manual/config.html>`_ for details).
 
   If provided, the optional ``comment`` will be passed as the ``COMMENT`` for
   the :command:`add_custom_target` command used to create the custom target
@@ -117,7 +117,7 @@ Functions
   variables before calling ``doxygen_add_docs()``. Any variable with a name of
   the form ``DOXYGEN_<tag>`` will have its value substituted for the
   corresponding ``<tag>`` configuration option in the ``Doxyfile``. See the
-  `Doxygen documentation <http://www.doxygen.org/manual/config.html>`_ for the
+  `Doxygen documentation <https://www.doxygen.nl/manual/config.html>`_ for the
   full list of supported configuration options.
 
   Some of Doxygen's defaults are overridden to provide more appropriate
@@ -432,9 +432,44 @@ endif()
 # or use something like homebrew.
 # ============== End OSX stuff ================
 
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+
 #
 # Find Doxygen...
 #
+function(_Doxygen_get_version doxy_version result_var doxy_path)
+        execute_process(
+            COMMAND "${doxy_path}" --version
+            OUTPUT_VARIABLE full_doxygen_version
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            RESULT_VARIABLE version_result
+        )
+
+        # Ignore any commit hashes, etc.
+        string(REGEX MATCH [[^[0-9]+\.[0-9]+\.[0-9]+]] sem_doxygen_version "${full_doxygen_version}")
+
+        set(${result_var} ${version_result} PARENT_SCOPE)
+        set(${doxy_version} ${sem_doxygen_version} PARENT_SCOPE)
+endfunction()
+
+function(_Doxygen_version_validator version_match doxy_path)
+    if(NOT DEFINED Doxygen_FIND_VERSION)
+        set(${is_valid_version} TRUE PARENT_SCOPE)
+    else()
+        _Doxygen_get_version(candidate_version version_result "${doxy_path}")
+
+        if(version_result)
+            message(DEBUG "Unable to determine candidate doxygen version at ${doxy_path}: ${version_result}")
+        endif()
+
+        find_package_check_version("${candidate_version}" valid_doxy_version
+            HANDLE_VERSION_RANGE
+        )
+
+        set(${version_match} "${valid_doxy_version}" PARENT_SCOPE)
+    endif()
+endfunction()
+
 macro(_Doxygen_find_doxygen)
     find_program(
         DOXYGEN_EXECUTABLE
@@ -445,17 +480,14 @@ macro(_Doxygen_find_doxygen)
             /Applications/Doxygen.app/Contents/MacOS
             /Applications/Utilities/Doxygen.app/Contents/Resources
             /Applications/Utilities/Doxygen.app/Contents/MacOS
-        DOC "Doxygen documentation generation tool (http://www.doxygen.org)"
+        DOC "Doxygen documentation generation tool (https://www.doxygen.nl)"
+        VALIDATOR _Doxygen_version_validator
     )
     mark_as_advanced(DOXYGEN_EXECUTABLE)
 
     if(DOXYGEN_EXECUTABLE)
-        execute_process(
-            COMMAND "${DOXYGEN_EXECUTABLE}" --version
-            OUTPUT_VARIABLE DOXYGEN_VERSION
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            RESULT_VARIABLE _Doxygen_version_result
-        )
+        _Doxygen_get_version(DOXYGEN_VERSION _Doxygen_version_result "${DOXYGEN_EXECUTABLE}")
+
         if(_Doxygen_version_result)
             message(WARNING "Unable to determine doxygen version: ${_Doxygen_version_result}")
         endif()
@@ -642,11 +674,11 @@ endforeach()
 unset(_comp)
 
 # Verify find results
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 find_package_handle_standard_args(
     Doxygen
     REQUIRED_VARS DOXYGEN_EXECUTABLE
     VERSION_VAR DOXYGEN_VERSION
+    HANDLE_VERSION_RANGE
     HANDLE_COMPONENTS
 )
 
@@ -919,7 +951,7 @@ doxygen_add_docs() for target ${targetName}")
     if(NOT DEFINED DOXYGEN_HAVE_DOT)
         # If you set the HAVE_DOT tag to YES then doxygen will assume the dot
         # tool is available from the path. This tool is part of Graphviz (see:
-        # http://www.graphviz.org/), a graph visualization toolkit from AT&T
+        # https://www.graphviz.org/), a graph visualization toolkit from AT&T
         # and Lucent Bell Labs. The other options in this section have no
         # effect if this option is set to NO.
         # Doxygen's default value is: NO.
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindEXPAT.cmake b/deps/cmake/share/cmake-3.25/Modules/FindEXPAT.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindEXPAT.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindEXPAT.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindEnvModules.cmake b/deps/cmake/share/cmake-3.25/Modules/FindEnvModules.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindEnvModules.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindEnvModules.cmake
index a4ac0b47..dab97acc 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindEnvModules.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindEnvModules.cmake
@@ -259,7 +259,7 @@ function(env_module_swap out_mod in_mod)
   )
 
   if(MOD_ARGS_OUTPUT_VARIABLE)
-    set(${MOD_ARGS_OUTPUT_VARIABLE} "${err_var}" PARENT_SCOPE)
+    set(${MOD_ARGS_OUTPUT_VARIABLE} "${tmp_out}" PARENT_SCOPE)
   endif()
   if(MOD_ARGS_RESULT_VARIABLE)
     set(${MOD_ARGS_RESULT_VARIABLE} ${tmp_ret} PARENT_SCOPE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindFLEX.cmake b/deps/cmake/share/cmake-3.25/Modules/FindFLEX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindFLEX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindFLEX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindFLTK.cmake b/deps/cmake/share/cmake-3.25/Modules/FindFLTK.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/FindFLTK.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindFLTK.cmake
index bab72560..d54d2f68 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindFLTK.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindFLTK.cmake
@@ -152,13 +152,17 @@ if(NOT FLTK_DIR)
 endif()
 
 # Check if FLTK was built using CMake
-if(EXISTS ${FLTK_DIR}/FLTKConfig.cmake)
-  set(FLTK_BUILT_WITH_CMAKE 1)
-endif()
+foreach(fltk_include IN LISTS FLTK_DIR)
+  if(EXISTS "${fltk_include}/FLTKConfig.cmake")
+    set(FLTK_BUILT_WITH_CMAKE 1)
+    set(FLTK_CMAKE_PATH "${fltk_include}/FLTKConfig.cmake")
+    break()
+  endif()
+endforeach()
 
 if(FLTK_BUILT_WITH_CMAKE)
   set(FLTK_FOUND 1)
-  include(${FLTK_DIR}/FLTKConfig.cmake)
+  include("${FLTK_CMAKE_PATH}")
 
   # Fluid
   if(FLUID_COMMAND)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindFLTK2.cmake b/deps/cmake/share/cmake-3.25/Modules/FindFLTK2.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindFLTK2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindFLTK2.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindFontconfig.cmake b/deps/cmake/share/cmake-3.25/Modules/FindFontconfig.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindFontconfig.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindFontconfig.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindFreetype.cmake b/deps/cmake/share/cmake-3.25/Modules/FindFreetype.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindFreetype.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindFreetype.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGCCXML.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGCCXML.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindGCCXML.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGCCXML.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGDAL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGDAL.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindGDAL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGDAL.cmake
index 5237e151..e6eac30f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindGDAL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindGDAL.cmake
@@ -160,7 +160,7 @@ unset(_gdal_version)
 unset(_gdal_versions)
 
 find_library(GDAL_LIBRARY
-  NAMES ${_gdal_lib} ${_gdal_libnames} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
+  NAMES ${_gdal_lib} ${_gdal_libnames} gdal gdald gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
   HINTS
      ENV GDAL_DIR
      ENV GDAL_ROOT
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGIF.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGIF.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindGIF.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGIF.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGLEW.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGLEW.cmake
similarity index 90%
rename from deps/cmake/share/cmake-3.21/Modules/FindGLEW.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGLEW.cmake
index b9ebe08b..bfde40b3 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindGLEW.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindGLEW.cmake
@@ -63,11 +63,36 @@ This module defines the following variables:
 #]=======================================================================]
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
 
 find_package(GLEW CONFIG QUIET)
 
 if(GLEW_FOUND)
   find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_CONFIG)
+  get_target_property(GLEW_INCLUDE_DIRS GLEW::GLEW INTERFACE_INCLUDE_DIRECTORIES)
+  set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS})
+  get_target_property(_GLEW_DEFS GLEW::GLEW INTERFACE_COMPILE_DEFINITIONS)
+  if("${_GLEW_DEFS}" MATCHES "GLEW_STATIC")
+    get_target_property(GLEW_LIBRARY_DEBUG GLEW::GLEW IMPORTED_LOCATION_DEBUG)
+    get_target_property(GLEW_LIBRARY_RELEASE GLEW::GLEW IMPORTED_LOCATION_RELEASE)
+  else()
+    get_target_property(GLEW_LIBRARY_DEBUG GLEW::GLEW IMPORTED_IMPLIB_DEBUG)
+    get_target_property(GLEW_LIBRARY_RELEASE GLEW::GLEW IMPORTED_IMPLIB_RELEASE)
+  endif()
+  get_target_property(_GLEW_LINK_INTERFACE GLEW::GLEW IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE) # same for debug and release
+  list(APPEND GLEW_LIBRARIES ${_GLEW_LINK_INTERFACE})
+  list(APPEND GLEW_LIBRARY ${_GLEW_LINK_INTERFACE})
+  select_library_configurations(GLEW)
+  if("${_GLEW_DEFS}" MATCHES "GLEW_STATIC")
+    set(GLEW_STATIC_LIBRARIES ${GLEW_LIBRARIES})
+  else()
+    set(GLEW_SHARED_LIBRARIES ${GLEW_LIBRARIES})
+  endif()
+  unset(_GLEW_DEFS)
+  unset(_GLEW_LINK_INTERFACE)
+  unset(GLEW_LIBRARY)
+  unset(GLEW_LIBRARY_DEBUG)
+  unset(GLEW_LIBRARY_RELEASE)
   return()
 endif()
 
@@ -171,8 +196,6 @@ find_library(GLEW_STATIC_LIBRARY_DEBUG
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES})
 unset(__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES)
 
-include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
-
 select_library_configurations(GLEW_SHARED)
 select_library_configurations(GLEW_STATIC)
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGLU.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGLU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindGLU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGLU.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/FindGLUT.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGLUT.cmake
new file mode 100644
index 00000000..09403bc1
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FindGLUT.cmake
@@ -0,0 +1,242 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindGLUT
+--------
+
+Find OpenGL Utility Toolkit (GLUT) library and include files.
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.1
+
+This module defines the :prop_tgt:`IMPORTED` targets:
+
+``GLUT::GLUT``
+ Defined if the system has GLUT.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+``GLUT_FOUND``
+  True if ``glut`` was found.
+
+``GLUT_INCLUDE_DIRS``
+  .. versionadded:: 3.23
+
+  Where to find GL/glut.h, etc.
+
+``GLUT_LIBRARIES``
+  List of libraries for using ``glut``.
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+This module may set the following variables depending on platform.
+These variables may optionally be set to help this module find the
+correct files, but clients should not use these as results:
+
+``GLUT_INCLUDE_DIR``
+  The full path to the directory containing ``GL/glut.h``,
+  not including ``GL/``.
+
+``GLUT_glut_LIBRARY``
+  The full path to the glut library.
+
+``GLUT_Xmu_LIBRARY``
+  The full path to the Xmu library.
+
+``GLUT_Xi_LIBRARY``
+  The full path to the Xi Library.
+
+Obsolete Variables
+^^^^^^^^^^^^^^^^^^
+
+The following variables may also be provided, for backwards compatibility:
+
+``GLUT_INCLUDE_DIR``
+  This is one of above `Cache Variables`_, but prior to CMake 3.23 was
+  also a result variable.  Prefer to use ``GLUT_INCLUDE_DIRS`` instead
+  in CMake 3.23 and above.
+#]=======================================================================]
+
+include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_GLUT QUIET glut)
+  if(NOT PC_GLUT_FOUND)
+    pkg_check_modules(PC_GLUT QUIET freeglut)
+  endif()
+endif()
+
+if(WIN32)
+  find_path( GLUT_INCLUDE_DIR NAMES GL/glut.h
+    PATHS  ${GLUT_ROOT_PATH}/include
+    HINTS ${PC_GLUT_INCLUDE_DIRS})
+  mark_as_advanced(GLUT_INCLUDE_DIR)
+  find_library( GLUT_glut_LIBRARY_RELEASE NAMES freeglut glut glut32
+    PATHS
+    ${OPENGL_LIBRARY_DIR}
+    ${GLUT_ROOT_PATH}/Release
+    HINTS
+    ${PC_GLUT_LIBRARY_DIRS}
+    )
+# N.B. As the pkg-config cannot distinguish between release and debug libraries,
+# assume that their hint was the both Debug and Release library.
+  find_library( GLUT_glut_LIBRARY_DEBUG NAMES freeglutd
+    PATHS
+    ${OPENGL_LIBRARY_DIR}
+    ${GLUT_ROOT_PATH}/Debug
+    HINTS
+    ${PC_GLUT_LIBRARY_DIRS}
+    )
+  mark_as_advanced(GLUT_glut_LIBRARY_RELEASE GLUT_glut_LIBRARY_DEBUG)
+  select_library_configurations(GLUT_glut)
+elseif(APPLE)
+  find_path(GLUT_INCLUDE_DIR glut.h PATHS ${OPENGL_LIBRARY_DIR} HINTS ${PC_GLUT_INCLUDE_DIRS})
+  mark_as_advanced(GLUT_INCLUDE_DIR)
+  find_library(GLUT_glut_LIBRARY GLUT HINTS ${PC_GLUT_LIBRARY_DIRS} DOC "GLUT library for OSX")
+  find_library(GLUT_cocoa_LIBRARY Cocoa DOC "Cocoa framework for OSX")
+  mark_as_advanced(GLUT_glut_LIBRARY GLUT_cocoa_LIBRARY)
+
+  if(GLUT_cocoa_LIBRARY AND NOT TARGET GLUT::Cocoa)
+    add_library(GLUT::Cocoa UNKNOWN IMPORTED)
+    # Cocoa should always be a Framework, but we check to make sure.
+    if(GLUT_cocoa_LIBRARY MATCHES "/([^/]+)\\.framework$")
+      set(_glut_cocoa "${GLUT_cocoa_LIBRARY}/${CMAKE_MATCH_1}")
+      if(EXISTS "${_glut_cocoa}.tbd")
+        string(APPEND _glut_cocoa ".tbd")
+      endif()
+      set_target_properties(GLUT::Cocoa PROPERTIES
+        IMPORTED_LOCATION "${_glut_cocoa}")
+    else()
+      set_target_properties(GLUT::Cocoa PROPERTIES
+        IMPORTED_LOCATION "${GLUT_cocoa_LIBRARY}")
+    endif()
+  endif()
+else()
+  if(BEOS)
+    set(_GLUT_INC_DIR /boot/develop/headers/os/opengl)
+    set(_GLUT_glut_LIB_DIR /boot/develop/lib/x86)
+  else()
+    find_library( GLUT_Xi_LIBRARY Xi
+      /usr/openwin/lib
+      )
+    mark_as_advanced(GLUT_Xi_LIBRARY)
+
+    find_library( GLUT_Xmu_LIBRARY Xmu
+      /usr/openwin/lib
+      )
+    mark_as_advanced(GLUT_Xmu_LIBRARY)
+
+    if(GLUT_Xi_LIBRARY AND NOT TARGET GLUT::Xi)
+      add_library(GLUT::Xi UNKNOWN IMPORTED)
+      set_target_properties(GLUT::Xi PROPERTIES
+        IMPORTED_LOCATION "${GLUT_Xi_LIBRARY}")
+    endif()
+
+    if(GLUT_Xmu_LIBRARY AND NOT TARGET GLUT::Xmu)
+      add_library(GLUT::Xmu UNKNOWN IMPORTED)
+      set_target_properties(GLUT::Xmu PROPERTIES
+        IMPORTED_LOCATION "${GLUT_Xmu_LIBRARY}")
+    endif()
+
+  endif ()
+
+  find_path( GLUT_INCLUDE_DIR GL/glut.h
+    PATHS
+    /usr/include/GL
+    /usr/openwin/share/include
+    /usr/openwin/include
+    /opt/graphics/OpenGL/include
+    /opt/graphics/OpenGL/contrib/libglut
+    ${_GLUT_INC_DIR}
+    HINTS
+    ${PC_GLUT_INCLUDE_DIRS}
+    )
+  mark_as_advanced(GLUT_INCLUDE_DIR)
+
+  find_library( GLUT_glut_LIBRARY glut
+    PATHS
+    /usr/openwin/lib
+    ${_GLUT_glut_LIB_DIR}
+    HINTS
+    ${PC_GLUT_LIBRARY_DIRS}
+    )
+  mark_as_advanced(GLUT_glut_LIBRARY)
+
+  unset(_GLUT_INC_DIR)
+  unset(_GLUT_glut_LIB_DIR)
+endif()
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR)
+
+if (GLUT_FOUND)
+  # Is -lXi and -lXmu required on all platforms that have it?
+  # If not, we need some way to figure out what platform we are on.
+  set( GLUT_LIBRARIES
+    ${GLUT_glut_LIBRARY}
+    )
+  set(GLUT_INCLUDE_DIRS
+    ${GLUT_INCLUDE_DIR}
+    )
+  foreach(v GLUT_Xmu_LIBRARY GLUT_Xi_LIBRARY GLUT_cocoa_LIBRARY)
+    if(${v})
+      list(APPEND GLUT_LIBRARIES ${${v}})
+    endif()
+  endforeach()
+
+  if(NOT TARGET GLUT::GLUT)
+    add_library(GLUT::GLUT UNKNOWN IMPORTED)
+    set_target_properties(GLUT::GLUT PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${GLUT_INCLUDE_DIRS}")
+    if(GLUT_glut_LIBRARY MATCHES "/([^/]+)\\.framework$")
+      set(_glut_glut "${GLUT_glut_LIBRARY}/${CMAKE_MATCH_1}")
+      if(EXISTS "${_glut_glut}.tbd")
+        string(APPEND _glut_glut ".tbd")
+      endif()
+      set_target_properties(GLUT::GLUT PROPERTIES
+        IMPORTED_LOCATION "${_glut_glut}")
+    else()
+      if(GLUT_glut_LIBRARY_RELEASE)
+        set_property(TARGET GLUT::GLUT APPEND PROPERTY
+          IMPORTED_CONFIGURATIONS RELEASE)
+        set_target_properties(GLUT::GLUT PROPERTIES
+          IMPORTED_LOCATION_RELEASE "${GLUT_glut_LIBRARY_RELEASE}")
+      endif()
+
+      if(GLUT_glut_LIBRARY_DEBUG)
+        set_property(TARGET GLUT::GLUT APPEND PROPERTY
+          IMPORTED_CONFIGURATIONS DEBUG)
+        set_target_properties(GLUT::GLUT PROPERTIES
+          IMPORTED_LOCATION_DEBUG "${GLUT_glut_LIBRARY_DEBUG}")
+      endif()
+
+      if(NOT GLUT_glut_LIBRARY_RELEASE AND NOT GLUT_glut_LIBRARY_DEBUG)
+        set_property(TARGET GLUT::GLUT APPEND PROPERTY
+          IMPORTED_LOCATION "${GLUT_glut_LIBRARY}")
+      endif()
+    endif()
+
+    if(TARGET GLUT::Xmu)
+      set_property(TARGET GLUT::GLUT APPEND
+        PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Xmu)
+    endif()
+
+    if(TARGET GLUT::Xi)
+      set_property(TARGET GLUT::GLUT APPEND
+        PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Xi)
+    endif()
+
+    if(TARGET GLUT::Cocoa)
+      set_property(TARGET GLUT::GLUT APPEND
+        PROPERTY INTERFACE_LINK_LIBRARIES GLUT::Cocoa)
+    endif()
+  endif()
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGSL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGSL.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindGSL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGSL.cmake
index 3d4e7f93..1943847c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindGSL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindGSL.cmake
@@ -77,7 +77,7 @@ endif()
 # *NIX systems.  See :module:`findpkgconfig`
 # This will return ``GSL_INCLUDEDIR`` and ``GSL_LIBDIR`` used below.
 if( GSL_USE_PKGCONFIG )
-  find_package(PkgConfig)
+  find_package(PkgConfig QUIET)
   pkg_check_modules( GSL QUIET gsl )
 
   if( EXISTS "${GSL_INCLUDEDIR}" )
@@ -139,7 +139,7 @@ if( NOT GSL_VERSION )
   # 2. If gsl-config is not available, try looking in gsl/gsl_version.h
   if( NOT GSL_VERSION AND EXISTS "${GSL_INCLUDE_DIRS}/gsl/gsl_version.h" )
     file( STRINGS "${GSL_INCLUDE_DIRS}/gsl/gsl_version.h" gsl_version_h_contents REGEX "define GSL_VERSION" )
-    string( REGEX REPLACE ".*([0-9]\\.[0-9][0-9]?).*" "\\1" GSL_VERSION ${gsl_version_h_contents} )
+    string( REGEX REPLACE ".*define[ ]+GSL_VERSION[ ]+\"([^\"]*)\".*" "\\1" GSL_VERSION ${gsl_version_h_contents} )
   endif()
 
   # might also try scraping the directory name for a regex match "gsl-X.X"
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGTK.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGTK.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindGTK.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGTK.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGTK2.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGTK2.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindGTK2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGTK2.cmake
index 00bfc29c..46348768 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindGTK2.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindGTK2.cmake
@@ -313,6 +313,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
             /usr/openwin/lib
             /sw/lib
             /opt/local/lib
+            /opt/homebrew/lib
             /usr/pkg/lib
             /usr/pkg/include/glib
             $ENV{GTKMM_BASEPATH}/include
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGTest.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGTest.cmake
similarity index 79%
rename from deps/cmake/share/cmake-3.21/Modules/FindGTest.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGTest.cmake
index 8e22f791..92334e44 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindGTest.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindGTest.cmake
@@ -22,6 +22,14 @@ Imported targets
 ``GTest::gtest_main``
   The Google Test ``gtest_main`` library, if found
 
+.. versionadded:: 3.23
+
+``GTest::gmock``
+  The Google Mock ``gmock`` library, if found; adds Thread::Thread
+  automatically
+``GTest::gmock_main``
+  The Google Mock ``gmock_main`` library, if found
+
 .. deprecated:: 3.20
   For backwards compatibility, this module defines additionally the
   following deprecated :prop_tgt:`IMPORTED` targets (available since 3.5):
@@ -32,7 +40,6 @@ Imported targets
 ``GTest::Main``
   The Google Test ``gtest_main`` library, if found
 
-
 Result variables
 ^^^^^^^^^^^^^^^^
 
@@ -245,15 +252,29 @@ if(MSVC AND GTEST_MSVC_SEARCH STREQUAL "MD")
     __gtest_find_library(GTEST_LIBRARY_DEBUG      gtest-mdd gtestd)
     __gtest_find_library(GTEST_MAIN_LIBRARY       gtest_main-md  gtest_main)
     __gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_main-mdd gtest_maind)
+    __gtest_find_library(GMOCK_LIBRARY            gmock-md  gmock)
+    __gtest_find_library(GMOCK_LIBRARY_DEBUG      gmock-mdd gmockd)
+    __gtest_find_library(GMOCK_MAIN_LIBRARY       gmock_main-md  gmock_main)
+    __gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_main-mdd gmock_maind)
 else()
     __gtest_find_library(GTEST_LIBRARY            gtest)
     __gtest_find_library(GTEST_LIBRARY_DEBUG      gtestd)
     __gtest_find_library(GTEST_MAIN_LIBRARY       gtest_main)
     __gtest_find_library(GTEST_MAIN_LIBRARY_DEBUG gtest_maind)
+    __gtest_find_library(GMOCK_LIBRARY            gmock)
+    __gtest_find_library(GMOCK_LIBRARY_DEBUG      gmockd)
+    __gtest_find_library(GMOCK_MAIN_LIBRARY       gmock_main)
+    __gtest_find_library(GMOCK_MAIN_LIBRARY_DEBUG gmock_maind)
 endif()
 
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTest DEFAULT_MSG GTEST_LIBRARY GTEST_INCLUDE_DIR GTEST_MAIN_LIBRARY)
 
+if(GMOCK_LIBRARY AND GMOCK_MAIN_LIBRARY)
+    set(GMock_FOUND True)
+else()
+    set(GMock_FOUND False)
+endif()
+
 if(GTest_FOUND)
     set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIR})
     __gtest_append_debugs(GTEST_LIBRARIES      GTEST_LIBRARY)
@@ -292,3 +313,36 @@ if(GTest_FOUND)
 
     __gtest_define_backwards_compatible_library_targets()
 endif()
+
+if(GMock_FOUND AND GTest_FOUND)
+    if(NOT TARGET GTest::gmock)
+        __gtest_determine_library_type(GMOCK_LIBRARY)
+        add_library(GTest::gmock ${GMOCK_LIBRARY_TYPE} IMPORTED)
+        set(_gmock_link_libraries "GTest::gtest")
+        if(TARGET Threads::Threads)
+            list(APPEND _gmock_link_libraries Threads::Threads)
+        endif()
+        set_target_properties(GTest::gmock PROPERTIES
+            INTERFACE_LINK_LIBRARIES "${_gmock_link_libraries}")
+        if(GMOCK_LIBRARY_TYPE STREQUAL "SHARED")
+            set_target_properties(GTest::gmock PROPERTIES
+                INTERFACE_COMPILE_DEFINITIONS "GMOCK_LINKED_AS_SHARED_LIBRARY=1")
+        endif()
+        if(GTEST_INCLUDE_DIRS)
+            set_target_properties(GTest::gmock PROPERTIES
+                INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIRS}")
+        endif()
+        __gtest_import_library(GTest::gmock GMOCK_LIBRARY "")
+        __gtest_import_library(GTest::gmock GMOCK_LIBRARY "RELEASE")
+        __gtest_import_library(GTest::gmock GMOCK_LIBRARY "DEBUG")
+    endif()
+    if(NOT TARGET GTest::gmock_main)
+        __gtest_determine_library_type(GMOCK_MAIN_LIBRARY)
+        add_library(GTest::gmock_main ${GMOCK_MAIN_LIBRARY_TYPE} IMPORTED)
+        set_target_properties(GTest::gmock_main PROPERTIES
+            INTERFACE_LINK_LIBRARIES "GTest::gmock")
+        __gtest_import_library(GTest::gmock_main GMOCK_MAIN_LIBRARY "")
+        __gtest_import_library(GTest::gmock_main GMOCK_MAIN_LIBRARY "RELEASE")
+        __gtest_import_library(GTest::gmock_main GMOCK_MAIN_LIBRARY "DEBUG")
+    endif()
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGettext.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGettext.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindGettext.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGettext.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGit.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGit.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/FindGit.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGit.cmake
index 99850b4f..08a386a7 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindGit.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindGit.cmake
@@ -31,16 +31,16 @@ Example usage:
    endif()
 #]=======================================================================]
 
-# Look for 'git' or 'eg' (easy git)
+# Look for 'git'
 #
-set(git_names git eg)
+set(git_names git)
 
 # Prefer .cmd variants on Windows unless running in a Makefile
 # in the MSYS shell.
 #
 if(CMAKE_HOST_WIN32)
   if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-    set(git_names git.cmd git eg.cmd eg)
+    set(git_names git.cmd git)
     # GitHub search path for Windows
     file(GLOB github_path
       "$ENV{LOCALAPPDATA}/Github/PortableGit*/cmd"
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGnuTLS.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGnuTLS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindGnuTLS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGnuTLS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindGnuplot.cmake b/deps/cmake/share/cmake-3.25/Modules/FindGnuplot.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindGnuplot.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindGnuplot.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindHDF5.cmake b/deps/cmake/share/cmake-3.25/Modules/FindHDF5.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/FindHDF5.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindHDF5.cmake
index e3353551..d662a7dd 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindHDF5.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindHDF5.cmake
@@ -161,6 +161,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 # scope somewhere else. We can't rely on it because different components may
 # have been requested for this call.
 set(HDF5_FOUND OFF)
+set(HDF5_LIBRARIES)
+set(HDF5_HL_LIBRARIES)
 
 # List of the valid HDF5 components
 set(HDF5_VALID_LANGUAGE_BINDINGS C CXX Fortran)
@@ -236,11 +238,11 @@ function(_HDF5_test_regular_compiler_C success version is_parallel)
       "  fid = H5Fcreate(\"foo.h5\",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);\n"
       "  return 0;\n"
       "}")
-    try_compile(${success} ${scratch_directory} ${test_file}
+    try_compile(${success} SOURCES ${test_file}
       COPY_FILE ${scratch_directory}/compiler_has_h5_c
     )
   endif()
-  if(${success})
+  if(${success} AND EXISTS ${scratch_directory}/compiler_has_h5_c)
     file(STRINGS ${scratch_directory}/compiler_has_h5_c INFO_STRINGS
       REGEX "^INFO:"
     )
@@ -284,11 +286,11 @@ function(_HDF5_test_regular_compiler_CXX success version is_parallel)
       "  H5File file(\"foo.h5\", H5F_ACC_TRUNC);\n"
       "  return 0;\n"
       "}")
-    try_compile(${success} ${scratch_directory} ${test_file}
+    try_compile(${success} SOURCES ${test_file}
       COPY_FILE ${scratch_directory}/compiler_has_h5_cxx
     )
   endif()
-  if(${success})
+  if(${success} AND EXISTS ${scratch_directory}/compiler_has_h5_cxx)
     file(STRINGS ${scratch_directory}/compiler_has_h5_cxx INFO_STRINGS
       REGEX "^INFO:"
     )
@@ -317,13 +319,11 @@ function(_HDF5_test_regular_compiler_Fortran success is_parallel)
     file(WRITE ${test_file}
       "program hdf5_hello\n"
       "  use hdf5\n"
-      "  use h5lt\n"
-      "  use h5ds\n"
       "  integer error\n"
       "  call h5open_f(error)\n"
       "  call h5close_f(error)\n"
       "end\n")
-    try_compile(${success} ${scratch_directory} ${test_file})
+    try_compile(${success} SOURCES ${test_file})
     if(${success})
       execute_process(COMMAND ${CMAKE_Fortran_COMPILER} -showconfig
         OUTPUT_VARIABLE config_output
@@ -560,7 +560,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
                 set(HDF5_${_lang}_FOUND TRUE)
             endif()
             if(HDF5_FIND_HL)
-                get_target_property(_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} IMPORTED_IMPLIB_${_hdf5_imported_conf} )
+                get_target_property(_hdf5_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} IMPORTED_IMPLIB_${_hdf5_imported_conf} )
                 if (NOT _hdf5_lang_hl_location)
                     get_target_property(_hdf5_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} LOCATION_${_hdf5_imported_conf})
                     if (NOT _hdf5_hl_lang_location)
@@ -586,6 +586,9 @@ if(NOT HDF5_FOUND)
   set(HDF5_COMPILER_NO_INTERROGATE TRUE)
   # Only search for languages we've enabled
   foreach(_lang IN LISTS HDF5_LANGUAGE_BINDINGS)
+    set(HDF5_${_lang}_LIBRARIES)
+    set(HDF5_${_lang}_HL_LIBRARIES)
+
     # First check to see if our regular compiler is one of wrappers
     if(_lang STREQUAL "C")
       _HDF5_test_regular_compiler_C(
@@ -811,6 +814,9 @@ if( NOT HDF5_FOUND )
     endif()
 
     foreach(_lang IN LISTS HDF5_LANGUAGE_BINDINGS)
+        set(HDF5_${_lang}_LIBRARIES)
+        set(HDF5_${_lang}_HL_LIBRARIES)
+
         # The "main" library.
         set(_hdf5_main_library "")
 
@@ -873,7 +879,7 @@ if( NOT HDF5_FOUND )
             # Add library-based search paths for Fortran modules.
             if (NOT _hdf5_main_library STREQUAL "")
               # gfortran module directory
-              if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+              if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "LCC")
                 get_filename_component(_hdf5_library_dir "${_hdf5_main_library}" DIRECTORY)
                 list(APPEND _hdf5_inc_extra_paths "${_hdf5_library_dir}")
                 unset(_hdf5_library_dir)
@@ -1044,8 +1050,12 @@ if (HDF5_FOUND)
       else()
         if (DEFINED "HDF5_${hdf5_target_name}_LIBRARY")
           set(_hdf5_location "${HDF5_${hdf5_target_name}_LIBRARY}")
+          set(_hdf5_location_release "${HDF5_${hdf5_target_name}_LIBRARY_RELEASE}")
+          set(_hdf5_location_debug "${HDF5_${hdf5_target_name}_LIBRARY_DEBUG}")
         elseif (DEFINED "HDF5_${hdf5_lang}_LIBRARY")
           set(_hdf5_location "${HDF5_${hdf5_lang}_LIBRARY}")
+          set(_hdf5_location_release "${HDF5_${hdf5_lang}_LIBRARY_RELEASE}")
+          set(_hdf5_location_debug "${HDF5_${hdf5_lang}_LIBRARY_DEBUG}")
         elseif (DEFINED "HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}")
           set(_hdf5_location "${HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}}")
         else ()
@@ -1060,10 +1070,24 @@ if (HDF5_FOUND)
          set(HDF5_${hdf5_lang}_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
         endif ()
         set_target_properties("hdf5::${hdf5_target_name}" PROPERTIES
-          IMPORTED_LOCATION "${_hdf5_location}"
-          IMPORTED_IMPLIB "${_hdf5_location}"
           INTERFACE_INCLUDE_DIRECTORIES "${HDF5_${hdf5_lang}_INCLUDE_DIRS}"
           INTERFACE_COMPILE_DEFINITIONS "${_hdf5_definitions}")
+        if (_hdf5_location_release)
+          set_property(TARGET "hdf5::${hdf5_target_name}" APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS RELEASE)
+          set_property(TARGET "hdf5::${hdf5_target_name}" PROPERTY
+            IMPORTED_LOCATION_RELEASE "${_hdf5_location_release}")
+        endif()
+        if (_hdf5_location_debug)
+          set_property(TARGET "hdf5::${hdf5_target_name}" APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS DEBUG)
+          set_property(TARGET "hdf5::${hdf5_target_name}" PROPERTY
+            IMPORTED_LOCATION_DEBUG "${_hdf5_location_debug}")
+        endif()
+        if (NOT _hdf5_location_release AND NOT _hdf5_location_debug)
+          set_property(TARGET "hdf5::${hdf5_target_name}" PROPERTY
+            IMPORTED_LOCATION "${_hdf5_location}")
+        endif()
         if (_hdf5_libtype STREQUAL "SHARED")
           set_property(TARGET "hdf5::${hdf5_target_name}" APPEND
             PROPERTY
@@ -1076,6 +1100,8 @@ if (HDF5_FOUND)
         unset(_hdf5_definitions)
         unset(_hdf5_libtype)
         unset(_hdf5_location)
+        unset(_hdf5_location_release)
+        unset(_hdf5_location_debug)
       endif ()
     endif ()
 
@@ -1105,8 +1131,12 @@ if (HDF5_FOUND)
       else()
         if (DEFINED "HDF5_${hdf5_target_name}_LIBRARY")
           set(_hdf5_location "${HDF5_${hdf5_target_name}_LIBRARY}")
+          set(_hdf5_location_release "${HDF5_${hdf5_target_name}_LIBRARY_RELEASE}")
+          set(_hdf5_location_debug "${HDF5_${hdf5_target_name}_LIBRARY_DEBUG}")
         elseif (DEFINED "HDF5_${hdf5_lang}_HL_LIBRARY")
           set(_hdf5_location "${HDF5_${hdf5_lang}_HL_LIBRARY}")
+          set(_hdf5_location_release "${HDF5_${hdf5_lang}_HL_LIBRARY_RELEASE}")
+          set(_hdf5_location_debug "${HDF5_${hdf5_lang}_HL_LIBRARY_DEBUG}")
         elseif (DEFINED "HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}")
           set(_hdf5_location "${HDF5_${hdf5_lang}_LIBRARY_${hdf5_target_name}}")
         elseif (hdf5_alt_target_name AND DEFINED "HDF5_${hdf5_lang}_LIBRARY_${hdf5_alt_target_name}")
@@ -1120,10 +1150,24 @@ if (HDF5_FOUND)
         add_library("hdf5::${hdf5_target_name}" UNKNOWN IMPORTED)
         string(REPLACE "-D" "" _hdf5_definitions "${HDF5_${hdf5_lang}_HL_DEFINITIONS}")
         set_target_properties("hdf5::${hdf5_target_name}" PROPERTIES
-          IMPORTED_LOCATION "${_hdf5_location}"
-          IMPORTED_IMPLIB "${_hdf5_location}"
           INTERFACE_INCLUDE_DIRECTORIES "${HDF5_${hdf5_lang}_HL_INCLUDE_DIRS}"
           INTERFACE_COMPILE_DEFINITIONS "${_hdf5_definitions}")
+        if (_hdf5_location_release)
+          set_property(TARGET "hdf5::${hdf5_target_name}" APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS RELEASE)
+          set_property(TARGET "hdf5::${hdf5_target_name}" PROPERTY
+            IMPORTED_LOCATION_RELEASE "${_hdf5_location_release}")
+        endif()
+        if (_hdf5_location_debug)
+          set_property(TARGET "hdf5::${hdf5_target_name}" APPEND PROPERTY
+            IMPORTED_CONFIGURATIONS DEBUG)
+          set_property(TARGET "hdf5::${hdf5_target_name}" PROPERTY
+            IMPORTED_LOCATION_DEBUG "${_hdf5_location_debug}")
+        endif()
+        if (NOT _hdf5_location_release AND NOT _hdf5_location_debug)
+          set_property(TARGET "hdf5::${hdf5_target_name}" PROPERTY
+            IMPORTED_LOCATION "${_hdf5_location}")
+        endif()
         if (_hdf5_libtype STREQUAL "SHARED")
           set_property(TARGET "hdf5::${hdf5_target_name}" APPEND
             PROPERTY
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindHSPELL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindHSPELL.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindHSPELL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindHSPELL.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindHTMLHelp.cmake b/deps/cmake/share/cmake-3.25/Modules/FindHTMLHelp.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindHTMLHelp.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindHTMLHelp.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindHg.cmake b/deps/cmake/share/cmake-3.25/Modules/FindHg.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindHg.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindHg.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindICU.cmake b/deps/cmake/share/cmake-3.25/Modules/FindICU.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindICU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindICU.cmake
index 2bb49ade..b4f4d713 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindICU.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindICU.cmake
@@ -172,7 +172,7 @@ function(_ICU_FIND)
       DOC "ICU ${program} executable"
       NO_PACKAGE_ROOT_PATH
       )
-    mark_as_advanced(cache_var)
+    mark_as_advanced("${cache_var}")
     set("${program_var}" "${${cache_var}}" PARENT_SCOPE)
   endforeach()
 
@@ -254,17 +254,10 @@ function(_ICU_FIND)
       set("${component_found}" ON)
       set("${component_found_compat}" ON)
       list(APPEND ICU_LIBRARY "${${component_cache}}")
-    endif()
-    mark_as_advanced("${component_found}")
-    mark_as_advanced("${component_found_compat}")
-    set("${component_cache}" "${${component_cache}}" PARENT_SCOPE)
-    set("${component_found}" "${${component_found}}" PARENT_SCOPE)
-    set("${component_found_compat}" "${${component_found_compat}}" PARENT_SCOPE)
-    if(component_found OR component_found_compat)
       if (ICU_FIND_REQUIRED_${component})
-        list(APPEND ICU_LIBS_FOUND "${component} (required)")
+        list(APPEND ICU_LIBS_FOUND "${component} (required): ${${component_cache}}")
       else()
-        list(APPEND ICU_LIBS_FOUND "${component} (optional)")
+        list(APPEND ICU_LIBS_FOUND "${component} (optional): ${${component_cache}}")
       endif()
     else()
       if (ICU_FIND_REQUIRED_${component})
@@ -274,6 +267,11 @@ function(_ICU_FIND)
         list(APPEND ICU_LIBS_NOTFOUND "${component} (optional)")
       endif()
     endif()
+    mark_as_advanced("${component_found}")
+    mark_as_advanced("${component_found_compat}")
+    set("${component_cache}" "${${component_cache}}" PARENT_SCOPE)
+    set("${component_found}" "${${component_found}}" PARENT_SCOPE)
+    set("${component_found_compat}" "${${component_found_compat}}" PARENT_SCOPE)
   endforeach()
   set(_ICU_REQUIRED_LIBS_FOUND "${ICU_REQUIRED_LIBS_FOUND}" PARENT_SCOPE)
   set(ICU_LIBRARY "${ICU_LIBRARY}" PARENT_SCOPE)
@@ -301,7 +299,7 @@ function(_ICU_FIND)
       HINTS ${icu_roots}
       PATH_SUFFIXES ${icu_data_suffixes}
       DOC "ICU ${data} data file")
-    mark_as_advanced(cache_var)
+    mark_as_advanced("${cache_var}")
     set("${data_var}" "${${cache_var}}" PARENT_SCOPE)
   endforeach()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindIce.cmake b/deps/cmake/share/cmake-3.25/Modules/FindIce.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindIce.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindIce.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindIconv.cmake b/deps/cmake/share/cmake-3.25/Modules/FindIconv.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindIconv.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindIconv.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindIcotool.cmake b/deps/cmake/share/cmake-3.25/Modules/FindIcotool.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindIcotool.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindIcotool.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindImageMagick.cmake b/deps/cmake/share/cmake-3.25/Modules/FindImageMagick.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindImageMagick.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindImageMagick.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindIntl.cmake b/deps/cmake/share/cmake-3.25/Modules/FindIntl.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindIntl.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindIntl.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/FindJNI.cmake b/deps/cmake/share/cmake-3.25/Modules/FindJNI.cmake
new file mode 100644
index 00000000..64163b00
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FindJNI.cmake
@@ -0,0 +1,665 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindJNI
+-------
+
+Find Java Native Interface (JNI) headers and libraries.
+
+JNI enables Java code running in a Java Virtual Machine (JVM) or Dalvik Virtual
+Machine (DVM) on Android to call and be called by native applications and
+libraries written in other languages such as C and C++.
+
+This module finds if Java is installed and determines where the
+include files and libraries are.  It also determines what the name of
+the library is.  The caller may set variable ``JAVA_HOME`` to specify a
+Java installation prefix explicitly.
+
+.. versionadded:: 3.24
+
+  Added imported targets, components ``AWT``, ``JVM``, and Android NDK support.
+  If no components are specified, the module defaults to an empty components
+  list while targeting Android, and all available components otherwise.
+
+  When using Android NDK, the corresponding package version is reported and a
+  specific release can be requested. At Android API level 31 and above, the
+  additional ``NativeHelper`` component can be requested. ``NativeHelper`` is
+  also exposed as an implicit dependency of the ``JVM`` component (only if this
+  does not cause a conflict) which provides a uniform access to JVM functions.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.24
+
+``JNI::JNI``
+  Main JNI target, defined only if ``jni.h`` was found.
+
+``JNI::AWT``
+  Java AWT Native Interface (JAWT) library, defined only if component ``AWT`` was
+  found.
+
+``JNI::JVM``
+  Java Virtual Machine (JVM) library, defined only if component ``JVM`` was found.
+
+``JNI::NativeHelper``
+  When targeting Android API level 31 and above, the import target will provide
+  access to ``libnativehelper.so`` that exposes JVM functions such as
+  ``JNI_CreateJavaVM``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following result variables:
+
+``JNI_INCLUDE_DIRS``
+  The include directories to use.
+``JNI_LIBRARIES``
+  The libraries to use (JAWT and JVM).
+``JNI_FOUND``
+  ``TRUE`` if JNI headers and libraries were found.
+``JNI_<component>_FOUND``
+  .. versionadded:: 3.24
+
+  ``TRUE`` if ``<component>`` was found.
+``JNI_VERSION``
+  Full Android NDK package version (including suffixes such as ``-beta3`` and
+  ``-rc1``) or undefined otherwise.
+``JNI_VERSION_MAJOR``
+  .. versionadded:: 3.24
+
+  Android NDK major version or undefined otherwise.
+``JNI_VERSION_MINOR``
+  .. versionadded:: 3.24
+
+  Android NDK minor version or undefined otherwise.
+``JNI_VERSION_PATCH``
+  .. versionadded:: 3.24
+
+  Android NDK patch version or undefined otherwise.
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+The following cache variables are also available to set or use:
+
+``JAVA_AWT_LIBRARY``
+  The path to the Java AWT Native Interface (JAWT) library.
+``JAVA_JVM_LIBRARY``
+  The path to the Java Virtual Machine (JVM) library.
+``JAVA_INCLUDE_PATH``
+  The include path to ``jni.h``.
+``JAVA_INCLUDE_PATH2``
+  The include path to machine-dependant headers ``jni_md.h`` and ``jniport.h``.
+  The variable is defined only if ``jni.h`` depends on one of these headers. In
+  contrast, Android NDK ``jni.h`` can be typically used standalone.
+``JAVA_AWT_INCLUDE_PATH``
+  The include path to ``jawt.h``.
+#]=======================================================================]
+
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW)
+
+include(CheckSourceCompiles)
+include(CMakePushCheckState)
+include(FindPackageHandleStandardArgs)
+
+if(NOT JNI_FIND_COMPONENTS)
+  if(ANDROID)
+    if(CMAKE_SYSTEM_VERSION LESS 31)
+      # There are no components for Android NDK
+      set(JNI_FIND_COMPONENTS)
+    else()
+      set(JNI_FIND_COMPONENTS NativeHelper)
+      set(JNI_FIND_REQUIRED_NativeHelper TRUE)
+    endif()
+  else(ANDROID)
+    set(JNI_FIND_COMPONENTS AWT JVM)
+    # For compatibility purposes, if no components are specified both are
+    # considered required.
+    set(JNI_FIND_REQUIRED_AWT TRUE)
+    set(JNI_FIND_REQUIRED_JVM TRUE)
+  endif()
+else()
+  # On Android, if JVM was requested we need to find NativeHelper as well which
+  # is an implicit dependency of JVM allowing to provide uniform access to basic
+  # JVM/DVM functionality.
+  if(ANDROID AND CMAKE_SYSTEM_VERSION GREATER_EQUAL 31 AND JVM IN_LIST JNI_FIND_COMPONENTS)
+    if(NOT NativeHelper IN_LIST JNI_FIND_COMPONENTS)
+      list(APPEND JNI_FIND_COMPONENTS NativeHelper)
+      # NativeHelper is required only if JVM was requested as such.
+      set(JNI_FIND_REQUIRED_NativeHelper ${JNI_FIND_REQUIRED_JVM})
+    endif()
+  endif()
+endif()
+
+# Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
+macro(java_append_library_directories _var)
+    # Determine java arch-specific library subdir
+    # Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk
+    # 1.6.0_18 + icedtea patches. However, it would be much better to base the
+    # guess on the first part of the GNU config.guess platform triplet.
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
+        set(_java_libarch "x32" "amd64" "i386")
+      else()
+        set(_java_libarch "amd64" "i386")
+      endif()
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
+        set(_java_libarch "i386")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+        set(_java_libarch "arm64" "aarch64")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha")
+        set(_java_libarch "alpha")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+        # Subdir is "arm" for both big-endian (arm) and little-endian (armel).
+        set(_java_libarch "arm" "aarch32")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+        # mips* machines are bi-endian mostly so processor does not tell
+        # endianness of the underlying system.
+        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}"
+            "mips" "mipsel" "mipseb" "mipsr6" "mipsr6el"
+            "mips64" "mips64el" "mips64r6" "mips64r6el"
+            "mipsn32" "mipsn32el" "mipsn32r6" "mipsn32r6el")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le")
+        set(_java_libarch "ppc64" "ppc64le")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
+        set(_java_libarch "ppc64" "ppc")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
+        set(_java_libarch "ppc" "ppc64")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
+        # Both flavors can run on the same processor
+        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "sparc" "sparcv9")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(parisc|hppa)")
+        set(_java_libarch "parisc" "parisc64")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390")
+        # s390 binaries can run on s390x machines
+        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "s390" "s390x")
+    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sh")
+        set(_java_libarch "sh")
+    else()
+        set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}")
+    endif()
+
+    # Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
+    # system is non-Linux (where the code above has not been well tested)
+    if(NOT _java_libarch OR NOT (CMAKE_SYSTEM_NAME MATCHES "Linux"))
+        list(APPEND _java_libarch "i386" "amd64" "ppc")
+    endif()
+
+    # Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
+    # current value to a hardcoded list. Remove possible duplicates.
+    list(REMOVE_DUPLICATES _java_libarch)
+
+    foreach(_path ${ARGN})
+        if(_path MATCHES "{libarch}")
+            foreach(_libarch ${_java_libarch})
+                string(REPLACE "{libarch}" "${_libarch}" _newpath "${_path}")
+                if(EXISTS ${_newpath})
+                    list(APPEND ${_var} "${_newpath}")
+                endif()
+            endforeach()
+        else()
+            if(EXISTS ${_path})
+                list(APPEND ${_var} "${_path}")
+            endif()
+        endif()
+    endforeach()
+endmacro()
+
+include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
+
+# Save CMAKE_FIND_FRAMEWORK
+if(DEFINED CMAKE_FIND_FRAMEWORK)
+  set(_JNI_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
+else()
+  unset(_JNI_CMAKE_FIND_FRAMEWORK)
+endif()
+
+if(_JAVA_HOME_EXPLICIT)
+  set(CMAKE_FIND_FRAMEWORK NEVER)
+endif()
+
+set(JAVA_AWT_LIBRARY_DIRECTORIES)
+if(_JAVA_HOME)
+  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+    ${_JAVA_HOME}/jre/lib/{libarch}
+    ${_JAVA_HOME}/jre/lib
+    ${_JAVA_HOME}/lib/{libarch}
+    ${_JAVA_HOME}/lib
+    ${_JAVA_HOME}
+    )
+endif()
+
+if (WIN32)
+  set (_JNI_HINTS)
+  macro (_JNI_GET_INSTALLED_VERSIONS _KIND)
+    execute_process(COMMAND REG QUERY "HKLM\\SOFTWARE\\JavaSoft\\${_KIND}"
+      RESULT_VARIABLE _JAVA_RESULT
+      OUTPUT_VARIABLE _JAVA_VERSIONS
+      ERROR_QUIET)
+    if (NOT  _JAVA_RESULT)
+      string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\${_KIND}\\\\[0-9._]+" _JNI_VERSIONS "${_JAVA_VERSIONS}")
+      string (REGEX REPLACE "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\${_KIND}\\\\([0-9._]+)" "\\1" _JNI_VERSIONS "${_JNI_VERSIONS}")
+      if (_JNI_VERSIONS)
+        # sort versions. Most recent first
+        list (SORT _JNI_VERSIONS COMPARE NATURAL ORDER DESCENDING)
+        foreach (_JNI_VERSION IN LISTS _JNI_VERSIONS)
+          string(REPLACE "_" "." _JNI_CMAKE_VERSION "${_JNI_VERSION}")
+          if (JNI_FIND_VERSION_EXACT
+              AND NOT _JNI_CMAKE_VERSION MATCHES "^${JNI_FIND_VERSION}")
+            continue()
+          endif()
+          if (DEFINED JNI_FIND_VERSION AND _JNI_CMAKE_VERSION VERSION_LESS JNI_FIND_VERSION)
+            break()
+          endif()
+          list(APPEND _JNI_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\${_KIND}\\${_JNI_VERSION};JavaHome]")
+        endforeach()
+      endif()
+    endif()
+  endmacro()
+
+    # for version 9 and upper
+  _JNI_GET_INSTALLED_VERSIONS("JDK")
+
+  # for versions older than 9
+  _JNI_GET_INSTALLED_VERSIONS("Java Development Kit")
+
+  foreach (_JNI_HINT IN LISTS _JNI_HINTS)
+    list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES "${_JNI_HINT}/lib")
+  endforeach()
+endif()
+
+set(_JNI_JAVA_DIRECTORIES_BASE
+  /usr/lib/jvm/java
+  /usr/lib/java
+  /usr/lib/jvm
+  /usr/local/lib/java
+  /usr/local/share/java
+  /usr/lib/j2sdk1.4-sun
+  /usr/lib/j2sdk1.5-sun
+  /opt/sun-jdk-1.5.0.04
+  /usr/lib/jvm/java-6-sun
+  /usr/lib/jvm/java-1.5.0-sun
+  /usr/lib/jvm/java-6-sun-1.6.0.00       # can this one be removed according to #8821 ? Alex
+  /usr/lib/jvm/java-6-openjdk
+  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0        # fedora
+  # Debian specific paths for default JVM
+  /usr/lib/jvm/default-java
+  # Arch Linux specific paths for default JVM
+  /usr/lib/jvm/default
+  # Ubuntu specific paths for default JVM
+  /usr/lib/jvm/java-11-openjdk-{libarch}    # Ubuntu 18.04 LTS
+  /usr/lib/jvm/java-8-openjdk-{libarch}     # Ubuntu 15.10
+  /usr/lib/jvm/java-7-openjdk-{libarch}     # Ubuntu 15.10
+  /usr/lib/jvm/java-6-openjdk-{libarch}     # Ubuntu 15.10
+  # OpenBSD specific paths for default JVM
+  /usr/local/jdk-1.7.0
+  /usr/local/jre-1.7.0
+  /usr/local/jdk-1.6.0
+  /usr/local/jre-1.6.0
+  # FreeBSD specific paths for default JVM
+  /usr/local/openjdk15
+  /usr/local/openjdk14
+  /usr/local/openjdk13
+  /usr/local/openjdk12
+  /usr/local/openjdk11
+  /usr/local/openjdk8
+  /usr/local/openjdk7
+  # SuSE specific paths for default JVM
+  /usr/lib64/jvm/java
+  /usr/lib64/jvm/jre
+  )
+
+set(_JNI_JAVA_AWT_LIBRARY_TRIES)
+set(_JNI_JAVA_INCLUDE_TRIES)
+
+foreach(_java_dir IN LISTS _JNI_JAVA_DIRECTORIES_BASE)
+  list(APPEND _JNI_JAVA_AWT_LIBRARY_TRIES
+    ${_java_dir}/jre/lib/{libarch}
+    ${_java_dir}/jre/lib
+    ${_java_dir}/lib/{libarch}
+    ${_java_dir}/lib
+    ${_java_dir}
+  )
+  list(APPEND _JNI_JAVA_INCLUDE_TRIES
+    ${_java_dir}/include
+  )
+endforeach()
+
+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+    ${_JNI_JAVA_AWT_LIBRARY_TRIES}
+  )
+
+set(JAVA_JVM_LIBRARY_DIRECTORIES)
+foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+  list(APPEND JAVA_JVM_LIBRARY_DIRECTORIES
+    "${dir}"
+    "${dir}/client"
+    "${dir}/server"
+    # IBM SDK, Java Technology Edition, specific paths
+    "${dir}/j9vm"
+    "${dir}/default"
+    )
+endforeach()
+
+set(JAVA_AWT_INCLUDE_DIRECTORIES)
+if(_JAVA_HOME)
+  list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
+endif()
+if (WIN32)
+  foreach (_JNI_HINT IN LISTS _JNI_HINTS)
+    list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "${_JNI_HINT}/include")
+  endforeach()
+endif()
+
+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
+  ${_JNI_JAVA_INCLUDE_TRIES}
+  )
+
+foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
+  get_filename_component(jpath "${JAVA_PROG}" PATH)
+  foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)
+    if(EXISTS ${jpath}/${JAVA_INC_PATH})
+      list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "${jpath}/${JAVA_INC_PATH}")
+    endif()
+  endforeach()
+  foreach(JAVA_LIB_PATH
+    ../lib ../jre/lib ../jre/lib/i386
+    ../java/lib ../java/jre/lib ../java/jre/lib/i386
+    ../share/java/lib ../share/java/jre/lib ../share/java/jre/lib/i386)
+    if(EXISTS ${jpath}/${JAVA_LIB_PATH})
+      list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES "${jpath}/${JAVA_LIB_PATH}")
+    endif()
+  endforeach()
+endforeach()
+
+if(APPLE)
+  if(CMAKE_FIND_FRAMEWORK STREQUAL "ONLY")
+    set(_JNI_SEARCHES FRAMEWORK)
+  elseif(CMAKE_FIND_FRAMEWORK STREQUAL "NEVER")
+    set(_JNI_SEARCHES NORMAL)
+  elseif(CMAKE_FIND_FRAMEWORK STREQUAL "LAST")
+    set(_JNI_SEARCHES NORMAL FRAMEWORK)
+  else()
+    set(_JNI_SEARCHES FRAMEWORK NORMAL)
+  endif()
+  set(_JNI_FRAMEWORK_JVM NAMES JavaVM)
+  set(_JNI_FRAMEWORK_JAWT "${_JNI_FRAMEWORK_JVM}")
+else()
+  set(_JNI_SEARCHES NORMAL)
+endif()
+
+set(_JNI_NORMAL_JVM
+  NAMES jvm
+  PATHS ${JAVA_JVM_LIBRARY_DIRECTORIES}
+  )
+
+set(_JNI_NORMAL_JAWT
+  NAMES jawt
+  PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
+  )
+
+foreach(search ${_JNI_SEARCHES})
+  if(JVM IN_LIST JNI_FIND_COMPONENTS)
+    find_library(JAVA_JVM_LIBRARY ${_JNI_${search}_JVM}
+      DOC "Java Virtual Machine library"
+    )
+  endif(JVM IN_LIST JNI_FIND_COMPONENTS)
+
+  if(AWT IN_LIST JNI_FIND_COMPONENTS)
+    find_library(JAVA_AWT_LIBRARY ${_JNI_${search}_JAWT}
+      DOC "Java AWT Native Interface library"
+    )
+    if(JAVA_JVM_LIBRARY)
+      break()
+    endif()
+  endif()
+endforeach()
+unset(_JNI_SEARCHES)
+unset(_JNI_FRAMEWORK_JVM)
+unset(_JNI_FRAMEWORK_JAWT)
+unset(_JNI_NORMAL_JVM)
+unset(_JNI_NORMAL_JAWT)
+
+# Find headers matching the library.
+if("${JAVA_JVM_LIBRARY};${JAVA_AWT_LIBRARY};" MATCHES "(/JavaVM.framework|-framework JavaVM);")
+  set(CMAKE_FIND_FRAMEWORK ONLY)
+else()
+  set(CMAKE_FIND_FRAMEWORK NEVER)
+endif()
+
+# add in the include path
+find_path(JAVA_INCLUDE_PATH jni.h
+  ${JAVA_AWT_INCLUDE_DIRECTORIES}
+  DOC "JNI include directory"
+)
+
+if(JAVA_INCLUDE_PATH)
+  if(CMAKE_C_COMPILER_LOADED)
+    set(_JNI_CHECK_LANG C)
+  elseif(CMAKE_CXX_COMPILER_LOADED)
+    set(_JNI_CHECK_LANG CXX)
+  else()
+    set(_JNI_CHECK_LANG FALSE)
+  endif()
+
+  # Skip the check if neither C nor CXX is loaded.
+  if(_JNI_CHECK_LANG)
+    cmake_push_check_state(RESET)
+    # The result of the following check is not relevant for the user as
+    # JAVA_INCLUDE_PATH2 will be added to REQUIRED_VARS if necessary.
+    set(CMAKE_REQUIRED_QUIET ON)
+    set(CMAKE_REQUIRED_INCLUDES ${JAVA_INCLUDE_PATH})
+
+    # Determine whether jni.h requires jni_md.h and add JAVA_INCLUDE_PATH2
+    # correspondingly to REQUIRED_VARS
+    check_source_compiles(${_JNI_CHECK_LANG}
+"
+#include <jni.h>
+int main(void) { return 0; }
+"
+      JNI_INCLUDE_PATH2_OPTIONAL)
+
+    cmake_pop_check_state()
+  else()
+    # If the above check is skipped assume jni_md.h is not needed.
+    set(JNI_INCLUDE_PATH2_OPTIONAL TRUE)
+  endif()
+
+  unset(_JNI_CHECK_LANG)
+endif()
+
+find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h
+  PATHS ${JAVA_INCLUDE_PATH}
+  ${JAVA_INCLUDE_PATH}/darwin
+  ${JAVA_INCLUDE_PATH}/win32
+  ${JAVA_INCLUDE_PATH}/linux
+  ${JAVA_INCLUDE_PATH}/freebsd
+  ${JAVA_INCLUDE_PATH}/openbsd
+  ${JAVA_INCLUDE_PATH}/solaris
+  ${JAVA_INCLUDE_PATH}/hp-ux
+  ${JAVA_INCLUDE_PATH}/alpha
+  ${JAVA_INCLUDE_PATH}/aix
+  DOC "jni_md.h jniport.h include directory"
+)
+
+if(AWT IN_LIST JNI_FIND_COMPONENTS)
+  find_path(JAVA_AWT_INCLUDE_PATH jawt.h
+    ${JAVA_INCLUDE_PATH}
+    DOC "Java AWT Native Interface include directory"
+  )
+endif()
+
+if(ANDROID)
+  # Some functions in jni.h (e.g., JNI_GetCreatedJavaVMs) are exported by
+  # libnativehelper.so, however, only when targeting Android API level >= 31.
+  find_library(JAVA_NativeHelper_LIBRARY NAMES nativehelper
+    DOC "Android nativehelper library"
+  )
+endif()
+
+# Set found components
+if(JAVA_AWT_INCLUDE_PATH AND JAVA_AWT_LIBRARY)
+  set(JNI_AWT_FOUND TRUE)
+else()
+  set(JNI_AWT_FOUND FALSE)
+endif()
+
+# JVM is available even on Android referencing the nativehelper library
+if(JAVA_JVM_LIBRARY)
+  set(JNI_JVM_FOUND TRUE)
+else(JAVA_JVM_LIBRARY)
+  set(JNI_JVM_FOUND FALSE)
+endif()
+
+if(JAVA_NativeHelper_LIBRARY)
+  # Alias JAVA_JVM_LIBRARY to JAVA_NativeHelper_LIBRARY
+  if(NOT JAVA_JVM_LIBRARY)
+    set(JAVA_JVM_LIBRARY "${JAVA_NativeHelper_LIBRARY}" CACHE FILEPATH
+      "Alias to nativehelper library" FORCE)
+    # Make JVM component available
+    set(JNI_JVM_FOUND TRUE)
+  endif()
+  set(JNI_NativeHelper_FOUND TRUE)
+else()
+  set(JNI_NativeHelper_FOUND FALSE)
+endif()
+
+# Restore CMAKE_FIND_FRAMEWORK
+if(DEFINED _JNI_CMAKE_FIND_FRAMEWORK)
+  set(CMAKE_FIND_FRAMEWORK ${_JNI_CMAKE_FIND_FRAMEWORK})
+  unset(_JNI_CMAKE_FIND_FRAMEWORK)
+else()
+  unset(CMAKE_FIND_FRAMEWORK)
+endif()
+
+if(ANDROID)
+  # Extract NDK version from source.properties in the NDK root
+  set(JAVA_SOURCE_PROPERTIES_FILE ${CMAKE_ANDROID_NDK}/source.properties)
+
+  if(EXISTS ${JAVA_SOURCE_PROPERTIES_FILE})
+    file(READ ${JAVA_SOURCE_PROPERTIES_FILE} NDK_VERSION_CONTENTS)
+    string (REGEX REPLACE
+      ".*Pkg\\.Revision = (([0-9]+)\\.([0-9]+)\\.([0-9]+)([^\n]+)?).*" "\\1"
+      JNI_VERSION "${NDK_VERSION_CONTENTS}")
+    set(JNI_VERSION_MAJOR ${CMAKE_MATCH_1})
+    set(JNI_VERSION_MINOR ${CMAKE_MATCH_2})
+    set(JNI_VERSION_PATCH ${CMAKE_MATCH_3})
+    set(JNI_VERSION_COMPONENTS 3)
+
+    set(JNI_FPHSA_ARGS VERSION_VAR JNI_VERSION HANDLE_VERSION_RANGE)
+  endif()
+endif()
+
+set(JNI_REQUIRED_VARS JAVA_INCLUDE_PATH)
+
+if(NOT JNI_INCLUDE_PATH2_OPTIONAL)
+  list(APPEND JNI_REQUIRED_VARS JAVA_INCLUDE_PATH2)
+endif()
+
+find_package_handle_standard_args(JNI
+  REQUIRED_VARS ${JNI_REQUIRED_VARS}
+  ${JNI_FPHSA_ARGS}
+  HANDLE_COMPONENTS
+)
+
+mark_as_advanced(
+  JAVA_AWT_LIBRARY
+  JAVA_JVM_LIBRARY
+  JAVA_AWT_INCLUDE_PATH
+  JAVA_INCLUDE_PATH
+  JAVA_INCLUDE_PATH2
+)
+
+set(JNI_LIBRARIES)
+
+foreach(component IN LISTS JNI_FIND_COMPONENTS)
+  if(JNI_${component}_FOUND)
+    list(APPEND JNI_LIBRARIES ${JAVA_${component}_LIBRARY})
+  endif()
+endforeach()
+
+set(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH})
+
+if(NOT JNI_INCLUDE_PATH2_OPTIONAL)
+  list(APPEND JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH2})
+endif()
+
+if(JNI_FIND_REQUIRED_AWT)
+  list(APPEND JNI_INCLUDE_DIRS ${JAVA_AWT_INCLUDE_PATH})
+endif()
+
+if(JNI_FOUND)
+  if(NOT TARGET JNI::JNI)
+    add_library(JNI::JNI IMPORTED INTERFACE)
+  endif()
+
+  set_property(TARGET JNI::JNI PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+    ${JAVA_INCLUDE_PATH})
+
+  if(JNI_NativeHelper_FOUND)
+    if(NOT TARGET JNI::NativeHelper)
+      add_library(JNI::NativeHelper IMPORTED UNKNOWN)
+    endif()
+
+    set_property(TARGET JNI::NativeHelper PROPERTY INTERFACE_LINK_LIBRARIES
+      JNI::JNI)
+    set_property(TARGET JNI::NativeHelper PROPERTY IMPORTED_LOCATION
+      ${JAVA_NativeHelper_LIBRARY})
+  endif()
+
+  if(NOT JNI_INCLUDE_PATH2_OPTIONAL AND JAVA_INCLUDE_PATH2)
+    set_property(TARGET JNI::JNI APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+      ${JAVA_INCLUDE_PATH2})
+  endif()
+
+  if(JNI_AWT_FOUND)
+    if(NOT TARGET JNI::AWT)
+      add_library(JNI::AWT IMPORTED UNKNOWN)
+    endif(NOT TARGET JNI::AWT)
+
+    set_property(TARGET JNI::AWT PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+      ${JAVA_AWT_INCLUDE_PATH})
+    set_property(TARGET JNI::AWT PROPERTY IMPORTED_LOCATION
+      ${JAVA_AWT_LIBRARY})
+    set_property(TARGET JNI::AWT PROPERTY INTERFACE_LINK_LIBRARIES JNI::JNI)
+  endif()
+
+  if(JNI_JVM_FOUND OR JNI_NativeHelper_FOUND)
+    # If Android nativehelper is available but not the JVM library, we still
+    # define the JNI::JVM target but only declare JNI::NativeHelper as an
+    # interface link library of the former. This provides a uniform access to
+    # fundamental JVM functionality regardless of whether JVM or DVM is used. At
+    # the same time, this allows the user to detect whenever exclusively
+    # nativehelper functionality is available.
+    if(NOT TARGET JNI::JVM)
+      if(JAVA_JVM_LIBRARY AND NOT JAVA_JVM_LIBRARY STREQUAL JAVA_NativeHelper_LIBRARY)
+        # JAVA_JVM_LIBRARY is not an alias of JAVA_NativeHelper_LIBRARY
+        add_library(JNI::JVM IMPORTED UNKNOWN)
+      else()
+        add_library(JNI::JVM IMPORTED INTERFACE)
+      endif()
+    endif(NOT TARGET JNI::JVM)
+
+    set_property(TARGET JNI::JVM PROPERTY INTERFACE_LINK_LIBRARIES JNI::JNI)
+    get_property(_JNI_JVM_TYPE TARGET JNI::JVM PROPERTY TYPE)
+
+    if(NOT _JNI_JVM_TYPE STREQUAL "INTERFACE_LIBRARY")
+      set_property(TARGET JNI::JVM PROPERTY IMPORTED_LOCATION
+        ${JAVA_JVM_LIBRARY})
+    else()
+      # We declare JNI::NativeHelper a dependency of JNI::JVM only if the latter
+      # was not initially found. If the solely theoretical situation occurs
+      # where both libraries are available, we want to avoid any potential
+      # errors that can occur due to duplicate symbols.
+      set_property(TARGET JNI::JVM APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+        JNI::NativeHelper)
+    endif()
+
+    unset(_JNI_JVM_TYPE)
+  endif()
+endif()
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindJPEG.cmake b/deps/cmake/share/cmake-3.25/Modules/FindJPEG.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindJPEG.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindJPEG.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/FindJasper.cmake b/deps/cmake/share/cmake-3.25/Modules/FindJasper.cmake
new file mode 100644
index 00000000..9a62669f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FindJasper.cmake
@@ -0,0 +1,90 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindJasper
+----------
+
+Find the Jasper JPEG2000 library.
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+``Jasper::Jasper``
+  The jasper library, if found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+``JASPER_FOUND``
+  system has Jasper
+``JASPER_INCLUDE_DIRS``
+  .. versionadded:: 3.22
+
+  the Jasper include directory
+``JASPER_LIBRARIES``
+  the libraries needed to use Jasper
+``JASPER_VERSION_STRING``
+  the version of Jasper found
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``JASPER_INCLUDE_DIR``
+  where to find jasper/jasper.h, etc.
+``JASPER_LIBRARY_RELEASE``
+  where to find the Jasper library (optimized).
+``JASPER_LIBARRY_DEBUG``
+  where to find the Jasper library (debug).
+#]=======================================================================]
+
+find_path(JASPER_INCLUDE_DIR jasper/jasper.h)
+mark_as_advanced(JASPER_INCLUDE_DIR)
+
+if(NOT JASPER_LIBRARIES)
+  find_package(JPEG)
+  find_library(JASPER_LIBRARY_RELEASE NAMES jasper libjasper)
+  find_library(JASPER_LIBRARY_DEBUG NAMES jasperd)
+  include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+  select_library_configurations(JASPER)
+endif()
+
+if(JASPER_INCLUDE_DIR AND EXISTS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h")
+  file(STRINGS "${JASPER_INCLUDE_DIR}/jasper/jas_config.h" jasper_version_str REGEX "^#define[\t ]+JAS_VERSION[\t ]+\".*\".*")
+  string(REGEX REPLACE "^#define[\t ]+JAS_VERSION[\t ]+\"([^\"]+)\".*" "\\1" JASPER_VERSION_STRING "${jasper_version_str}")
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(Jasper
+                                  REQUIRED_VARS JASPER_LIBRARIES JASPER_INCLUDE_DIR JPEG_LIBRARIES
+                                  VERSION_VAR JASPER_VERSION_STRING)
+
+if(JASPER_FOUND)
+  set(JASPER_LIBRARIES ${JASPER_LIBRARIES} ${JPEG_LIBRARIES})
+  set(JASPER_INCLUDE_DIRS ${JASPER_INCLUDE_DIR})
+  if(NOT TARGET Jasper::Jasper)
+    add_library(Jasper::Jasper UNKNOWN IMPORTED)
+    if(JASPER_INCLUDE_DIRS)
+      set_target_properties(Jasper::Jasper PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${JASPER_INCLUDE_DIRS}")
+    endif()
+    if(EXISTS "${JASPER_LIBRARY_RELEASE}")
+      set_property(TARGET Jasper::Jasper APPEND PROPERTY
+        IMPORTED CONFIGURATION RELEASE)
+      set_target_properties(Jasper::Jasper PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+        IMPORTED_LOCATION "${JASPER_LIBRARY_RELEASE}")
+    endif()
+    if(EXISTS "${JASPER_LIBRARY_DEBUG}")
+      set_property(TARGET Jasper::Jasper APPEND PROPERTY
+        IMPORTED CONFIGURATION DEBUG)
+      set_target_properties(Jasper::Jasper PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
+        IMPORTED_LOCATION "${JASPER_LIBRARY_DEBUG}")
+    endif()
+  endif()
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindJava.cmake b/deps/cmake/share/cmake-3.25/Modules/FindJava.cmake
similarity index 76%
rename from deps/cmake/share/cmake-3.21/Modules/FindJava.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindJava.cmake
index 4f0e0fea..e8fb1208 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindJava.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindJava.cmake
@@ -90,50 +90,35 @@ if(_JAVA_HOME)
 endif()
 if (WIN32)
   macro (_JAVA_GET_INSTALLED_VERSIONS _KIND)
-    execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\${_KIND}
+    execute_process(COMMAND REG QUERY "HKLM\\SOFTWARE\\JavaSoft\\${_KIND}"
       RESULT_VARIABLE _JAVA_RESULT
       OUTPUT_VARIABLE _JAVA_VERSIONS
       ERROR_QUIET)
     if (NOT  _JAVA_RESULT)
-      string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\${_KIND}\\\\[0-9.]+" _JAVA_VERSIONS "${_JAVA_VERSIONS}")
+      string (REGEX MATCHALL "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\${_KIND}\\\\[0-9._]+" _JAVA_VERSIONS "${_JAVA_VERSIONS}")
+      string (REGEX REPLACE "HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\JavaSoft\\\\${_KIND}\\\\([0-9._]+)" "\\1" _JAVA_VERSIONS "${_JAVA_VERSIONS}")
       if (_JAVA_VERSIONS)
         # sort versions. Most recent first
-        ## handle version 9 apart from other versions to get correct ordering
-        set (_JAVA_V9 ${_JAVA_VERSIONS})
-        list (FILTER _JAVA_VERSIONS EXCLUDE REGEX "${_KIND}\\\\9")
-        list (SORT _JAVA_VERSIONS)
-        list (REVERSE _JAVA_VERSIONS)
-        list (FILTER _JAVA_V9 INCLUDE REGEX "${_KIND}\\\\9")
-        list (SORT _JAVA_V9)
-        list (REVERSE _JAVA_V9)
-        list (APPEND _JAVA_VERSIONS ${_JAVA_V9})
-        foreach (_JAVA_HINT IN LISTS _JAVA_VERSIONS)
-          list(APPEND _JAVA_HINTS "[${_JAVA_HINT};JavaHome]/bin")
+        list (SORT _JAVA_VERSIONS COMPARE NATURAL ORDER DESCENDING)
+        foreach (_JAVA_VERSION IN LISTS _JAVA_VERSIONS)
+          string(REPLACE "_" "." _JAVA_CMAKE_VERSION "${_JAVA_VERSION}")
+          if (Java_FIND_VERSION_EXACT
+              AND NOT _JAVA_CMAKE_VERSION MATCHES "^${Java_FIND_VERSION}")
+            continue()
+          endif()
+          list(APPEND _JAVA_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\${_KIND}\\${_JAVA_VERSION};JavaHome]/bin")
         endforeach()
       endif()
     endif()
   endmacro()
 
-  # search for installed versions for version 9 and upper
+  # for version 9 and upper
   _JAVA_GET_INSTALLED_VERSIONS("JDK")
   _JAVA_GET_INSTALLED_VERSIONS("JRE")
 
-  list(APPEND _JAVA_HINTS
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.9;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.8;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.7;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.6;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.5;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.4;JavaHome]/bin"
-  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.3;JavaHome]/bin"
-  )
+  # for versions older than 9
+  _JAVA_GET_INSTALLED_VERSIONS("Java Development Kit")
+  _JAVA_GET_INSTALLED_VERSIONS("Java Runtime Environment")
 endif()
 
 # Hard-coded guesses should still go in PATHS. This ensures that the user
@@ -159,23 +144,25 @@ find_program(Java_JAVA_EXECUTABLE
 
 if(Java_JAVA_EXECUTABLE)
     execute_process(COMMAND "${Java_JAVA_EXECUTABLE}" -version
-      RESULT_VARIABLE res
-      OUTPUT_VARIABLE var
-      ERROR_VARIABLE var # sun-java output to stderr
+      RESULT_VARIABLE _java_res
+      OUTPUT_VARIABLE _java_var
+      ERROR_VARIABLE _java_var # sun-java output to stderr
       OUTPUT_STRIP_TRAILING_WHITESPACE
       ERROR_STRIP_TRAILING_WHITESPACE)
-    if( res )
-      if(var MATCHES "Unable to locate a Java Runtime to invoke|No Java runtime present, requesting install")
-        set(Java_JAVA_EXECUTABLE Java_JAVA_EXECUTABLE-NOTFOUND)
-      elseif(${Java_FIND_REQUIRED})
-        message( FATAL_ERROR "Error executing java -version" )
-      else()
-        message( STATUS "Warning, could not run java -version")
+    if(_java_res)
+      if(NOT Java_FIND_QUIETLY)
+        message(STATUS "Java version check failed: "
+          "${Java_JAVA_EXECUTABLE} -version returned an error: \"${_java_var}\"")
+      endif()
+      if(_java_var MATCHES "Unable to locate a Java Runtime|No Java runtime present, requesting install")
+        # macOS distributes a java stub that provides an error message
+        set(Java_JAVA_EXECUTABLE "Java_JAVA_EXECUTABLE-NOTFOUND" CACHE PATH
+            "Path to the Java executable" FORCE)
       endif()
     else()
       # Extract version components (up to 4 levels) from "java -version" output.
       set(_java_version_regex [[(([0-9]+)(\.([0-9]+)(\.([0-9]+)(_([0-9]+))?)?)?.*)]])
-      if(var MATCHES "java version \"${_java_version_regex}\"")
+      if(_java_var MATCHES "java version \"${_java_version_regex}\"")
         # Sun, GCJ, older OpenJDK
         set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
         set(Java_VERSION_MAJOR "${CMAKE_MATCH_2}")
@@ -190,7 +177,7 @@ if(Java_JAVA_EXECUTABLE)
           set(Java_VERSION_PATCH 0)
         endif()
         set(Java_VERSION_TWEAK "${CMAKE_MATCH_8}")
-      elseif(var MATCHES "openjdk version \"${_java_version_regex}\"")
+      elseif(_java_var MATCHES "openjdk version \"${_java_version_regex}\"")
         # OpenJDK
         set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
         set(Java_VERSION_MAJOR "${CMAKE_MATCH_2}")
@@ -205,14 +192,14 @@ if(Java_JAVA_EXECUTABLE)
           set(Java_VERSION_PATCH 0)
         endif()
         set(Java_VERSION_TWEAK "${CMAKE_MATCH_8}")
-      elseif(var MATCHES "openjdk version \"([0-9]+)-[A-Za-z]+\"")
+      elseif(_java_var MATCHES "openjdk version \"([0-9]+)-[A-Za-z]+\"")
         # OpenJDK 9 early access builds or locally built
         set(Java_VERSION_STRING "1.${CMAKE_MATCH_1}.0")
         set(Java_VERSION_MAJOR "1")
         set(Java_VERSION_MINOR "${CMAKE_MATCH_1}")
         set(Java_VERSION_PATCH "0")
         set(Java_VERSION_TWEAK "")
-      elseif(var MATCHES "java full version \"kaffe-${_java_version_regex}\"")
+      elseif(_java_var MATCHES "java full version \"kaffe-${_java_version_regex}\"")
         # Kaffe style
         set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
         set(Java_VERSION_MAJOR "${CMAKE_MATCH_2}")
@@ -221,7 +208,7 @@ if(Java_JAVA_EXECUTABLE)
         set(Java_VERSION_TWEAK "${CMAKE_MATCH_8}")
       else()
         if(NOT Java_FIND_QUIETLY)
-          string(REPLACE "\n" "\n  " ver_msg "\n${var}")
+          string(REPLACE "\n" "\n  " ver_msg "\n${_java_var}")
           message(WARNING "Java version not recognized:${ver_msg}\nPlease report.")
         endif()
         set(Java_VERSION_STRING "")
@@ -230,18 +217,21 @@ if(Java_JAVA_EXECUTABLE)
         set(Java_VERSION_PATCH "")
         set(Java_VERSION_TWEAK "")
       endif()
+      unset(_java_version_regex)
+      unset(_java_var)
       set(Java_VERSION "${Java_VERSION_MAJOR}")
       if(NOT "x${Java_VERSION}" STREQUAL "x")
-        foreach(c MINOR PATCH TWEAK)
-          if(NOT "x${Java_VERSION_${c}}" STREQUAL "x")
-            string(APPEND Java_VERSION ".${Java_VERSION_${c}}")
+        foreach(_java_c MINOR PATCH TWEAK)
+          if(NOT "x${Java_VERSION_${_java_c}}" STREQUAL "x")
+            string(APPEND Java_VERSION ".${Java_VERSION_${_java_c}}")
           else()
             break()
           endif()
         endforeach()
+        unset(_java_c)
       endif()
     endif()
-
+    unset(_java_res)
 endif()
 
 
@@ -330,19 +320,20 @@ if(Java_FIND_COMPONENTS)
       set(Java_${component}_FOUND TRUE)
     endforeach()
   endif()
+  unset(_JAVA_REQUIRED_VARS)
 else()
   # Check for Development
   if(Java_VERSION VERSION_LESS "10")
     find_package_handle_standard_args(Java
       REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE
                     Java_JAVAH_EXECUTABLE Java_JAVADOC_EXECUTABLE
-      VERSION_VAR Java_VERSION_STRING
+      VERSION_VAR Java_VERSION
       )
   else()
     find_package_handle_standard_args(Java
       REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE
                     Java_JAVADOC_EXECUTABLE
-      VERSION_VAR Java_VERSION_STRING
+      VERSION_VAR Java_VERSION
       )
   endif()
 endif()
@@ -356,7 +347,7 @@ mark_as_advanced(
   Java_JAVADOC_EXECUTABLE
   Java_IDLJ_EXECUTABLE
   Java_JARSIGNER_EXECUTABLE
-  )
+)
 
 # LEGACY
 set(JAVA_RUNTIME ${Java_JAVA_EXECUTABLE})
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindKDE3.cmake b/deps/cmake/share/cmake-3.25/Modules/FindKDE3.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindKDE3.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindKDE3.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindKDE4.cmake b/deps/cmake/share/cmake-3.25/Modules/FindKDE4.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindKDE4.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindKDE4.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLAPACK.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLAPACK.cmake
similarity index 72%
rename from deps/cmake/share/cmake-3.21/Modules/FindLAPACK.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLAPACK.cmake
index 3146e06d..1eecb1cb 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindLAPACK.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindLAPACK.cmake
@@ -12,7 +12,7 @@ This module finds an installed Fortran library that implements the
 
 At least one of the ``C``, ``CXX``, or ``Fortran`` languages must be enabled.
 
-.. _`LAPACK linear-algebra interface`: http://www.netlib.org/lapack/
+.. _`LAPACK linear-algebra interface`: https://netlib.org/lapack/
 
 Input Variables
 ^^^^^^^^^^^^^^^
@@ -35,6 +35,26 @@ The following variables may be set to influence this module's behavior:
   if set ``pkg-config`` will be used to search for a LAPACK library first
   and if one is found that is preferred
 
+``BLA_PKGCONFIG_LAPACK``
+  .. versionadded:: 3.25
+
+  If set, the ``pkg-config`` method will look for this module name instead of
+  just ``lapack``.
+
+
+``BLA_SIZEOF_INTEGER``
+  .. versionadded:: 3.22
+
+  Specify the BLAS/LAPACK library integer size:
+
+  ``4``
+    Search for a BLAS/LAPACK with 32-bit integer interfaces.
+  ``8``
+    Search for a BLAS/LAPACK with 64-bit integer interfaces.
+  ``ANY``
+    Search for any BLAS/LAPACK.
+    Most likely, a BLAS/LAPACK with 32-bit integer interfaces will be found.
+
 Imported targets
 ^^^^^^^^^^^^^^^^
 
@@ -168,9 +188,9 @@ function(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _deps _addl
       list(APPEND _libraries "${_library}")
     else()
       string(REGEX REPLACE "[^A-Za-z0-9]" "_" _lib_var "${_library}")
-      set(_combined_name ${_combined_name}_${_lib_var})
+      string(APPEND _combined_name "_${_lib_var}")
       if(NOT "${_deps}" STREQUAL "")
-        set(_combined_name ${_combined_name}_deps)
+        string(APPEND _combined_name "_deps")
       endif()
       if(_libraries_work)
         find_library(${_prefix}_${_lib_var}_LIBRARY
@@ -188,7 +208,7 @@ function(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _deps _addl
 
   foreach(_flag ${_flags})
     string(REGEX REPLACE "[^A-Za-z0-9]" "_" _flag_var "${_flag}")
-    set(_combined_name ${_combined_name}_${_flag_var})
+    string(APPEND _combined_name "_${_flag_var}")
   endforeach()
   if(_libraries_work)
     # Test this combination of libraries.
@@ -247,6 +267,17 @@ if(NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED OR CMAKE_Fortran_CO
     "FindLAPACK requires Fortran, C, or C++ to be enabled.")
 endif()
 
+if(NOT BLA_SIZEOF_INTEGER)
+  # in the reality we do not know which API of BLAS/LAPACK is masked in library
+  set(_lapack_sizeof_integer "ANY")
+elseif((BLA_SIZEOF_INTEGER STREQUAL "ANY") OR
+       (BLA_SIZEOF_INTEGER STREQUAL "4") OR
+       (BLA_SIZEOF_INTEGER STREQUAL "8"))
+  set(_lapack_sizeof_integer ${BLA_SIZEOF_INTEGER})
+else()
+  message(FATAL_ERROR "BLA_SIZEOF_INTEGER can have only <no value>, ANY, 4, or 8 values")
+endif()
+
 # Load BLAS
 if(NOT LAPACK_NOT_FOUND_MESSAGE)
   _lapack_find_dependency(BLAS)
@@ -254,8 +285,11 @@ endif()
 
 # Search with pkg-config if specified
 if(BLA_PREFER_PKGCONFIG)
-  find_package(PkgConfig)
-  pkg_check_modules(PKGC_LAPACK lapack)
+  if(NOT BLA_PKGCONFIG_LAPACK)
+    set(BLA_PKGCONFIG_LAPACK "lapack")
+  endif()
+  find_package(PkgConfig QUIET)
+  pkg_check_modules(PKGC_LAPACK QUIET ${BLA_PKGCONFIG_LAPACK})
   if(PKGC_LAPACK_FOUND)
     set(LAPACK_FOUND TRUE)
     set(LAPACK_LIBRARIES "${PKGC_LAPACK_LINK_LIBRARIES}")
@@ -288,17 +322,23 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
 
     _lapack_find_dependency(Threads)
 
-    if(BLA_VENDOR MATCHES "_64ilp")
+    if(_lapack_sizeof_integer EQUAL 8)
       set(LAPACK_mkl_ILP_MODE "ilp64")
-    else()
+    elseif(_lapack_sizeof_integer EQUAL 4)
       set(LAPACK_mkl_ILP_MODE "lp64")
+    else()
+      if(BLA_VENDOR MATCHES "_64ilp")
+        set(LAPACK_mkl_ILP_MODE "ilp64")
+      else()
+        set(LAPACK_mkl_ILP_MODE "lp64")
+      endif()
     endif()
 
     set(LAPACK_SEARCH_LIBS "")
 
     if(BLA_F95)
       set(LAPACK_mkl_SEARCH_SYMBOL "cheev_f95")
-      set(_LIBRARIES LAPACK95_LIBRARIES)
+      set(_LAPACK_LIBRARIES LAPACK95_LIBRARIES)
       set(_BLAS_LIBRARIES ${BLAS95_LIBRARIES})
 
       # old
@@ -311,7 +351,7 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
         "mkl_lapack95_${LAPACK_mkl_ILP_MODE}")
     else()
       set(LAPACK_mkl_SEARCH_SYMBOL "cheev")
-      set(_LIBRARIES LAPACK_LIBRARIES)
+      set(_LAPACK_LIBRARIES LAPACK_LIBRARIES)
       set(_BLAS_LIBRARIES ${BLAS_LIBRARIES})
 
       # old and new >= 10.3
@@ -350,10 +390,10 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
         "lib/${LAPACK_mkl_ARCH_NAME}"
         )
 
-    # First try empty lapack libs
-    if(NOT ${_LIBRARIES})
+    # First try empty lapack libs (implicitly linked or automatic from BLAS)
+    if(NOT ${_LAPACK_LIBRARIES})
       check_lapack_libraries(
-        ${_LIBRARIES}
+        ${_LAPACK_LIBRARIES}
         LAPACK
         ${LAPACK_mkl_SEARCH_SYMBOL}
         ""
@@ -363,18 +403,23 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
         "${LAPACK_mkl_LIB_PATH_SUFFIXES}"
         "${_BLAS_LIBRARIES}"
       )
+      if(LAPACK_WORKS AND NOT _BLAS_LIBRARIES)
+        # Give a more helpful "found" message
+        set(LAPACK_WORKS "implicitly linked")
+        set(_lapack_fphsa_req_var LAPACK_WORKS)
+      endif()
     endif()
 
     # Then try the search libs
-    foreach(IT ${LAPACK_SEARCH_LIBS})
-      string(REPLACE " " ";" SEARCH_LIBS ${IT})
-      if(NOT ${_LIBRARIES})
+    foreach(_search ${LAPACK_SEARCH_LIBS})
+      string(REPLACE " " ";" _search ${_search})
+      if(NOT ${_LAPACK_LIBRARIES})
         check_lapack_libraries(
-          ${_LIBRARIES}
+          ${_LAPACK_LIBRARIES}
           LAPACK
           ${LAPACK_mkl_SEARCH_SYMBOL}
           ""
-          "${SEARCH_LIBS}"
+          "${_search}"
           "${CMAKE_THREAD_LIBS_INIT};${LAPACK_mkl_LM};${LAPACK_mkl_LDL}"
           "${LAPACK_mkl_MKLROOT}"
           "${LAPACK_mkl_LIB_PATH_SUFFIXES}"
@@ -383,6 +428,7 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
       endif()
     endforeach()
 
+    unset(_search)
     unset(LAPACK_mkl_ILP_MODE)
     unset(LAPACK_mkl_SEARCH_SYMBOL)
     unset(LAPACK_mkl_LM)
@@ -412,48 +458,70 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
   # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/)
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All"))
+    set(_lapack_flexiblas_lib "flexiblas")
+
+    if(_lapack_sizeof_integer EQUAL 8)
+      string(APPEND _lapack_flexiblas_lib "64")
+    endif()
+
     check_lapack_libraries(
       LAPACK_LIBRARIES
       LAPACK
       cheev
       ""
-      "flexiblas"
+      "${_lapack_flexiblas_lib}"
       ""
       ""
       ""
       "${BLAS_LIBRARIES}"
     )
+
+    unset(_lapack_flexiblas_lib)
   endif()
 
   # OpenBLAS? (http://www.openblas.net)
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR STREQUAL "OpenBLAS" OR BLA_VENDOR STREQUAL "All"))
+    set(_lapack_openblas_lib "openblas")
+
+    if(_lapack_sizeof_integer EQUAL 8)
+      string(APPEND _lapack_openblas_lib "64")
+    endif()
+
     check_lapack_libraries(
       LAPACK_LIBRARIES
       LAPACK
       cheev
       ""
-      "openblas"
+      "${_lapack_openblas_lib}"
       ""
       ""
       ""
       "${BLAS_LIBRARIES}"
     )
+
+    unset(_lapack_openblas_lib)
   endif()
 
   # ArmPL? (https://developer.arm.com/tools-and-software/server-and-hpc/compile/arm-compiler-for-linux/arm-performance-libraries)
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR MATCHES "Arm" OR BLA_VENDOR STREQUAL "All"))
     # Check for 64bit Integer support
-    if(BLA_VENDOR MATCHES "_ilp64")
+    if(_lapack_sizeof_integer EQUAL 8)
       set(LAPACK_armpl_LIB "armpl_ilp64")
-    else()
+    elseif(_lapack_sizeof_integer EQUAL 4)
       set(LAPACK_armpl_LIB "armpl_lp64")
+    else()
+      if(BLA_VENDOR MATCHES "_ilp64")
+        set(LAPACK_armpl_LIB "armpl_ilp64")
+      else()
+        set(LAPACK_armpl_LIB "armpl_lp64")
+      endif()
     endif()
 
     # Check for OpenMP support, VIA BLA_VENDOR of Arm_mp or Arm_ipl64_mp
     if(BLA_VENDOR MATCHES "_mp")
-     set(LAPACK_armpl_LIB "${LAPACK_armpl_LIB}_mp")
+      string(APPEND LAPACK_armpl_LIB "_mp")
     endif()
 
     check_lapack_libraries(
@@ -472,17 +540,50 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
   # FLAME's blis library? (https://github.com/flame/blis)
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR STREQUAL "FLAME" OR BLA_VENDOR STREQUAL "All"))
+    if(_lapack_sizeof_integer EQUAL 8)
+      if(BLA_VENDOR STREQUAL "FLAME")
+        message(FATAL_ERROR "libFLAME does not support Int64 type")
+      endif()
+    else()
+      check_lapack_libraries(
+        LAPACK_LIBRARIES
+        LAPACK
+        cheev
+        ""
+        "flame"
+        ""
+        ""
+        ""
+        "${BLAS_LIBRARIES}"
+      )
+    endif()
+  endif()
+
+  # LAPACK in SCSL library? (SGI/Cray Scientific Library)
+  if(NOT LAPACK_LIBRARIES
+      AND (BLA_VENDOR MATCHES "SCSL" OR BLA_VENDOR STREQUAL "All"))
+    set(_lapack_scsl_lib "scs")
+
+    if(_lapack_sizeof_integer EQUAL 8)
+      string(APPEND _lapack_scsl_lib "_i8")
+    endif()
+    # Check for OpenMP support, VIA BLA_VENDOR of scs_mp
+    if(BLA_VENDOR MATCHES "_mp")
+      string(APPEND _lapack_scsl_lib "_mp")
+    endif()
+
     check_lapack_libraries(
       LAPACK_LIBRARIES
       LAPACK
       cheev
       ""
-      "flame"
+      "${_lapack_scsl_lib}"
       ""
       ""
       ""
       "${BLAS_LIBRARIES}"
     )
+    unset(_lapack_scsl_lib)
   endif()
 
   # BLAS in acml library?
@@ -495,105 +596,121 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
   # Apple LAPACK library?
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All"))
-    check_lapack_libraries(
-      LAPACK_LIBRARIES
-      LAPACK
-      cheev
-      ""
-      "Accelerate"
-      ""
-      ""
-      ""
-      "${BLAS_LIBRARIES}"
-    )
+    if(_lapack_sizeof_integer EQUAL 8)
+      if(BLA_VENDOR STREQUAL "Apple")
+        message(FATAL_ERROR "Accelerate Framework does not support Int64 type")
+      endif()
+    else()
+      check_lapack_libraries(
+        LAPACK_LIBRARIES
+        LAPACK
+        cheev
+        ""
+        "Accelerate"
+        ""
+        ""
+        ""
+        "${BLAS_LIBRARIES}"
+      )
+    endif()
   endif()
 
   # Apple NAS (vecLib) library?
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All"))
-    check_lapack_libraries(
-      LAPACK_LIBRARIES
-      LAPACK
-      cheev
-      ""
-      "vecLib"
-      ""
-      ""
-      ""
-      "${BLAS_LIBRARIES}"
-    )
+    if(_lapack_sizeof_integer EQUAL 8)
+      if(BLA_VENDOR STREQUAL "NAS")
+        message(FATAL_ERROR "Accelerate Framework does not support Int64 type")
+      endif()
+    else()
+      check_lapack_libraries(
+        LAPACK_LIBRARIES
+        LAPACK
+        cheev
+        ""
+        "vecLib"
+        ""
+        ""
+        ""
+        "${BLAS_LIBRARIES}"
+      )
+    endif()
   endif()
 
   # Elbrus Math Library?
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR MATCHES "EML" OR BLA_VENDOR STREQUAL "All"))
-
-    set(LAPACK_EML_LIB "eml")
-
-    # Check for OpenMP support, VIA BLA_VENDOR of eml_mt
-    if(BLA_VENDOR MATCHES "_mt")
-     set(LAPACK_EML_LIB "${LAPACK_EML_LIB}_mt")
+    if(BLAS_LIBRARIES MATCHES "eml.+")
+      set(LAPACK_LIBRARIES ${BLAS_LIBRARIES})
     endif()
-
-    check_lapack_libraries(
-      LAPACK_LIBRARIES
-      LAPACK
-      cheev
-      ""
-      "${LAPACK_EML_LIB}"
-      ""
-      ""
-      ""
-      "${BLAS_LIBRARIES}"
-    )
   endif()
 
   # Fujitsu SSL2 Library?
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR MATCHES "Fujitsu_SSL2" OR BLA_VENDOR STREQUAL "All"))
-    if(BLA_VENDOR STREQUAL "Fujitsu_SSL2BLAMP")
-      set(_ssl2_suffix BLAMP)
-    else()
-      set(_ssl2_suffix)
+    if(BLAS_LIBRARIES MATCHES "fjlapack.+")
+      set(LAPACK_LIBRARIES ${BLAS_LIBRARIES})
+      set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
     endif()
-    set(_ssl2_blas)
-    if(BLAS_LIBRARIES STREQUAL "")
-      set(_ssl2_blas "${BLAS_LINKER_FLAGS}")
-    else()
-      set(_ssl2_blas "${BLAS_LIBRARIES} ${BLAS_LINKER_FLAGS}")
+  endif()
+
+  # LAPACK in IBM ESSL library?
+  if(NOT LAPACK_LIBRARIES
+      AND (BLA_VENDOR MATCHES "IBMESSL" OR BLA_VENDOR STREQUAL "All"))
+    if(BLAS_LIBRARIES MATCHES "essl.+")
+      set(LAPACK_LIBRARIES ${BLAS_LIBRARIES})
     endif()
-    check_lapack_libraries(
-      LAPACK_LIBRARIES
-      LAPACK
-      cheev
-      "-SSL2${_ssl2_suffix}"
-      ""
-      ""
-      ""
-      ""
-      "${_ssl2_blas}"
-    )
-    if(LAPACK_LIBRARIES)
-      set(LAPACK_LINKER_FLAGS "-SSL2${_ssl2_suffix}")
-      set(_lapack_fphsa_req_var LAPACK_LINKER_FLAGS)
-    endif()
-    unset(_ssl2_suffix)
   endif()
 
   # NVHPC Library?
+
   if(NOT LAPACK_LIBRARIES
       AND (BLA_VENDOR MATCHES "NVHPC" OR BLA_VENDOR STREQUAL "All"))
+    set(_lapack_nvhpc_lib "lapack")
+
+    if(_lapack_sizeof_integer EQUAL 8)
+      string(APPEND _lapack_nvhpc_lib "_ilp64")
+    elseif(_lapack_sizeof_integer EQUAL 4)
+      string(APPEND _lapack_nvhpc_lib "_lp64")
+    endif()
+    set(_lapack_nvhpc_flags)
+    if(";${CMAKE_C_COMPILER_ID};${CMAKE_CXX_COMPILER_ID};${CMAKE_Fortran_COMPILER_ID};" MATCHES ";(NVHPC|PGI);")
+      set(_lapack_nvhpc_flags "-fortranlibs")
+    endif()
+
     check_lapack_libraries(
       LAPACK_LIBRARIES
       LAPACK
       cheev
       ""
-      "lapack"
-      "-fortranlibs"
+      "${_lapack_nvhpc_lib}"
+      "${_lapack_nvhpc_flags}"
       ""
       ""
       "${BLAS_LIBRARIES}"
     )
+
+    # an additional check for NVHPC 2020
+    # which does not have differentiation
+    # between lp64 and ilp64 modes
+    if(NOT LAPACK_LIBRARIES AND NOT _lapack_sizeof_integer EQUAL 8)
+      set(_lapack_nvhpc_lib "lapack")
+
+      check_lapack_libraries(
+        LAPACK_LIBRARIES
+        LAPACK
+        cheev
+        ""
+        "${_lapack_nvhpc_lib}"
+        "${_lapack_nvhpc_flags}"
+        ""
+        ""
+        "${BLAS_LIBRARIES}"
+      )
+    endif()
+
+    unset(_lapack_nvhpc_lib)
+    unset(_lapack_nvhpc_flags)
   endif()
 
   # Generic LAPACK library?
@@ -601,6 +718,7 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
       AND (BLA_VENDOR STREQUAL "Generic"
            OR BLA_VENDOR STREQUAL "ATLAS"
            OR BLA_VENDOR STREQUAL "All"))
+    set(_lapack_generic_lib "lapack")
     if(BLA_STATIC)
       # We do not know for sure how the LAPACK reference implementation
       # is built on this host.  Guess typical dependencies.
@@ -608,18 +726,25 @@ if(NOT LAPACK_NOT_FOUND_MESSAGE)
     else()
       set(_lapack_generic_deps "")
     endif()
+
+    if(_lapack_sizeof_integer EQUAL 8)
+      string(APPEND _lapack_generic_lib "64")
+    endif()
+
     check_lapack_libraries(
       LAPACK_LIBRARIES
       LAPACK
       cheev
       ""
-      "lapack"
+      "${_lapack_generic_lib}"
       "${_lapack_generic_deps}"
       ""
       ""
       "${BLAS_LIBRARIES}"
     )
+
     unset(_lapack_generic_deps)
+    unset(_lapack_generic_lib)
   endif()
 endif()
 
@@ -646,3 +771,6 @@ if(LAPACK_LIBRARIES STREQUAL "LAPACK_LIBRARIES-PLACEHOLDER-FOR-EMPTY-LIBRARIES")
 endif()
 
 _add_lapack_target()
+unset(_lapack_fphsa_req_var)
+unset(_lapack_sizeof_integer)
+unset(_LAPACK_LIBRARIES)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLATEX.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLATEX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindLATEX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLATEX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLTTngUST.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLTTngUST.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/FindLTTngUST.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLTTngUST.cmake
index f478e4d2..eaace4fa 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindLTTngUST.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindLTTngUST.cmake
@@ -8,7 +8,7 @@ FindLTTngUST
 .. versionadded:: 3.6
 
 Find
-`Linux Trace Toolkit Next Generation (LTTng-UST) <http://lttng.org/>`__ library.
+`Linux Trace Toolkit Next Generation (LTTng-UST) <https://lttng.org/>`__ library.
 
 Imported target
 ^^^^^^^^^^^^^^^
@@ -63,11 +63,11 @@ if(LTTNGUST_INCLUDE_DIRS AND LTTNGUST_LIBRARIES)
          REGEX "^[\t ]*#define[\t ]+LTTNG_UST_MINOR_VERSION[\t ]+[0-9]+[\t ]*$")
     file(STRINGS "${lttngust_version_file}" lttngust_version_patch_string
          REGEX "^[\t ]*#define[\t ]+LTTNG_UST_PATCHLEVEL_VERSION[\t ]+[0-9]+[\t ]*$")
-    string(REGEX REPLACE ".*([0-9]+).*" "\\1"
+    string(REGEX REPLACE ".*[\t ]+([0-9]+).*" "\\1"
            lttngust_v_major "${lttngust_version_major_string}")
-    string(REGEX REPLACE ".*([0-9]+).*" "\\1"
+    string(REGEX REPLACE ".*[\t ]+([0-9]+).*" "\\1"
            lttngust_v_minor "${lttngust_version_minor_string}")
-    string(REGEX REPLACE ".*([0-9]+).*" "\\1"
+    string(REGEX REPLACE ".*[\t ]+([0-9]+).*" "\\1"
            lttngust_v_patch "${lttngust_version_patch_string}")
     set(LTTNGUST_VERSION_STRING
         "${lttngust_v_major}.${lttngust_v_minor}.${lttngust_v_patch}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLibArchive.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLibArchive.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindLibArchive.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLibArchive.cmake
index 08078a29..9d3ac13f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindLibArchive.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindLibArchive.cmake
@@ -26,6 +26,9 @@ The module defines the following ``IMPORTED`` targets:
 .. versionadded:: 3.6
   Support for new libarchive 3.2 version string format.
 
+.. versionadded:: 3.17
+  Provides an imported target.
+
 #]=======================================================================]
 
 find_path(LibArchive_INCLUDE_DIR
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLibLZMA.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLibLZMA.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindLibLZMA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLibLZMA.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLibXml2.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLibXml2.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindLibXml2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLibXml2.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLibXslt.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLibXslt.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindLibXslt.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLibXslt.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLibinput.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLibinput.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindLibinput.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLibinput.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLua.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLua.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindLua.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLua.cmake
index 32642fe2..b56a7b1c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindLua.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindLua.cmake
@@ -10,19 +10,22 @@ Locate Lua library.
 .. versionadded:: 3.18
   Support for Lua 5.4.
 
-This module defines::
-
-::
-
-  LUA_FOUND          - if false, do not try to link to Lua
-  LUA_LIBRARIES      - both lua and lualib
-  LUA_INCLUDE_DIR    - where to find lua.h
-  LUA_VERSION_STRING - the version of Lua found
-  LUA_VERSION_MAJOR  - the major version of Lua
-  LUA_VERSION_MINOR  - the minor version of Lua
-  LUA_VERSION_PATCH  - the patch version of Lua
-
+This module defines:
 
+``LUA_FOUND``
+  if false, do not try to link to Lua
+``LUA_LIBRARIES``
+  both lua and lualib
+``LUA_INCLUDE_DIR``
+  where to find lua.h
+``LUA_VERSION_STRING``
+  the version of Lua found
+``LUA_VERSION_MAJOR``
+  the major version of Lua
+``LUA_VERSION_MINOR``
+  the minor version of Lua
+``LUA_VERSION_PATCH``
+  the patch version of Lua
 
 Note that the expected include convention is
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLua50.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLua50.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindLua50.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLua50.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindLua51.cmake b/deps/cmake/share/cmake-3.25/Modules/FindLua51.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindLua51.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindLua51.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMFC.cmake b/deps/cmake/share/cmake-3.25/Modules/FindMFC.cmake
similarity index 79%
rename from deps/cmake/share/cmake-3.21/Modules/FindMFC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindMFC.cmake
index b8ca71bb..2d5de891 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindMFC.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindMFC.cmake
@@ -29,23 +29,19 @@ endif()
 if(MFC_ATTEMPT_TRY_COMPILE)
   if(NOT DEFINED MFC_HAVE_MFC)
     set(CHECK_INCLUDE_FILE_VAR "afxwin.h")
-    configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
+    file(READ ${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in _CIF_SOURCE_CONTENT)
+    string(CONFIGURE "${_CIF_SOURCE_CONTENT}" _CIF_SOURCE_CONTENT)
     message(CHECK_START "Looking for MFC")
     # Try both shared and static as the root project may have set the /MT flag
     try_compile(MFC_HAVE_MFC
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
+      SOURCE_FROM_VAR CheckIncludeFile.cxx _CIF_SOURCE_CONTENT
       CMAKE_FLAGS
       -DCMAKE_MFC_FLAG:STRING=2
       -DCOMPILE_DEFINITIONS:STRING=-D_AFXDLL
       OUTPUT_VARIABLE OUTPUT)
     if(NOT MFC_HAVE_MFC)
-      configure_file(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
-        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
       try_compile(MFC_HAVE_MFC
-        ${CMAKE_BINARY_DIR}
-        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
+        SOURCE_FROM_VAR CheckIncludeFile.cxx _CIF_SOURCE_CONTENT
         CMAKE_FLAGS
         -DCMAKE_MFC_FLAG:STRING=1
         OUTPUT_VARIABLE OUTPUT)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPEG.cmake b/deps/cmake/share/cmake-3.25/Modules/FindMPEG.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPEG.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindMPEG.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPEG2.cmake b/deps/cmake/share/cmake-3.25/Modules/FindMPEG2.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPEG2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindMPEG2.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPI.cmake b/deps/cmake/share/cmake-3.25/Modules/FindMPI.cmake
similarity index 90%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindMPI.cmake
index c48decbb..e15be916 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindMPI.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindMPI.cmake
@@ -105,7 +105,7 @@ This module performs a four step search for an MPI implementation:
 
 1. Search for ``MPIEXEC_EXECUTABLE`` and, if found, use its base directory.
 2. Check if the compiler has MPI support built-in. This is the case if the user passed a
-   compiler wrapper as ``CMAKE_<LANG>_COMPILER`` or if they're on a Cray system.
+   compiler wrapper as ``CMAKE_<LANG>_COMPILER`` or if they use Cray system compiler wrappers.
 3. Attempt to find an MPI compiler wrapper and determine the compiler information from it.
 4. Try to find an MPI implementation that does not ship such a wrapper by guessing settings.
    Currently, only Microsoft MPI and MPICH2 on Windows are supported.
@@ -267,6 +267,7 @@ cmake_policy(PUSH)
 cmake_policy(SET CMP0057 NEW) # if IN_LIST
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+find_package(PkgConfig QUIET)
 
 # Generic compiler names
 set(_MPI_C_GENERIC_COMPILER_NAMES          mpicc    mpcc      mpicc_r mpcc_r)
@@ -333,6 +334,11 @@ set(_MPI_XL_Fortran_COMPILER_NAMES         mpixlf95   mpixlf95_r mpxlf95 mpxlf95
                                            mpixlf77   mpixlf77_r mpxlf77 mpxlf77_r
                                            mpixlf     mpixlf_r   mpxlf   mpxlf_r)
 
+# Cray Compiler names
+set(_MPI_Cray_C_COMPILER_NAMES             cc)
+set(_MPI_Cray_CXX_COMPILER_NAMES           CC)
+set(_MPI_Cray_Fortran_COMPILER_NAMES       ftn)
+
 # Prepend vendor-specific compiler wrappers to the list. If we don't know the compiler,
 # attempt all of them.
 # By attempting vendor-specific compiler names first, we should avoid situations where the compiler wrapper
@@ -385,11 +391,11 @@ function (_MPI_check_compiler LANG QUERY_FLAG OUTPUT_VARIABLE RESULT_VARIABLE)
   # library that has invalid or missing version information there would be warning
   # messages emitted by ld.so in the compiler output. In either case, we'll treat
   # the output as invalid.
-  if("${WRAPPER_OUTPUT}" MATCHES "undefined reference|unrecognized|need to set|no version information available|command not found")
+  if(WRAPPER_OUTPUT MATCHES "undefined reference|unrecognized|need to set|no version information available|command not found")
     set(WRAPPER_RETURN 255)
   endif()
   # Ensure that no error output might be passed upwards.
-  if(NOT WRAPPER_RETURN EQUAL 0)
+  if(NOT WRAPPER_RETURN EQUAL "0")
     unset(WRAPPER_OUTPUT)
   else()
     # Strip leading whitespace
@@ -435,13 +441,13 @@ function (_MPI_interrogate_compiler LANG)
   if(MSVC)
     get_filename_component(_MPI_UNDERLAYING_COMPILER "${_MPI_UNDERLAYING_COMPILER}" NAME)
   endif()
-  if("${LANG}" STREQUAL "C")
+  if(LANG STREQUAL "C")
     _MPI_env_set_ifnot(I_MPI_CC _MPI_UNDERLAYING_COMPILER)
     _MPI_env_set_ifnot(MPICH_CC _MPI_UNDERLAYING_COMPILER)
-  elseif("${LANG}" STREQUAL "CXX")
+  elseif(LANG STREQUAL "CXX")
     _MPI_env_set_ifnot(I_MPI_CXX _MPI_UNDERLAYING_COMPILER)
     _MPI_env_set_ifnot(MPICH_CXX _MPI_UNDERLAYING_COMPILER)
-  elseif("${LANG}" STREQUAL "Fortran")
+  elseif(LANG STREQUAL "Fortran")
     _MPI_env_set_ifnot(I_MPI_FC _MPI_UNDERLAYING_COMPILER)
     _MPI_env_set_ifnot(MPICH_FC _MPI_UNDERLAYING_COMPILER)
     _MPI_env_set_ifnot(I_MPI_F77 _MPI_UNDERLAYING_COMPILER)
@@ -464,10 +470,10 @@ function (_MPI_interrogate_compiler LANG)
   # or a newer version of LAM/MPI, and implies that -showme:link will also work.
   # Open MPI also supports -show, but separates linker and compiler information
   _MPI_check_compiler(${LANG} "-showme:compile" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
-  if (MPI_COMPILER_RETURN EQUAL 0)
+  if (MPI_COMPILER_RETURN EQUAL "0")
     _MPI_check_compiler(${LANG} "-showme:link" MPI_LINK_CMDLINE MPI_COMPILER_RETURN)
 
-    if (NOT MPI_COMPILER_RETURN EQUAL 0)
+    if (NOT MPI_COMPILER_RETURN EQUAL "0")
       unset(MPI_COMPILE_CMDLINE)
     endif()
   endif()
@@ -476,38 +482,58 @@ function (_MPI_interrogate_compiler LANG)
   # For modern versions, both do the same as -show. However, for old versions, they do differ
   # when called for mpicxx and mpif90 and it's necessary to use them over -show in order to find the
   # removed MPI C++ bindings.
-  if (NOT MPI_COMPILER_RETURN EQUAL 0)
+  if (NOT MPI_COMPILER_RETURN EQUAL "0")
     _MPI_check_compiler(${LANG} "-compile-info" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
 
-    if (MPI_COMPILER_RETURN EQUAL 0)
+    if (MPI_COMPILER_RETURN EQUAL "0")
       _MPI_check_compiler(${LANG} "-link-info" MPI_LINK_CMDLINE MPI_COMPILER_RETURN)
 
-      if (NOT MPI_COMPILER_RETURN EQUAL 0)
+      if (NOT MPI_COMPILER_RETURN EQUAL "0")
         unset(MPI_COMPILE_CMDLINE)
       endif()
     endif()
   endif()
 
+  # Cray compiler wrappers come usually without a separate mpicc/c++/ftn, but offer
+  # --cray-print-opts=...
+  if (NOT MPI_COMPILER_RETURN EQUAL "0")
+    _MPI_check_compiler(${LANG} "--cray-print-opts=cflags"
+                        MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
+
+    if (MPI_COMPILER_RETURN EQUAL "0")
+      # Pass --no-as-needed so the mpi library is always linked. Otherwise, the
+      # Cray compiler wrapper puts an --as-needed flag around the mpi library,
+      # and it is not linked unless code directly refers to it.
+      _MPI_check_compiler(${LANG} "--no-as-needed;--cray-print-opts=libs"
+                          MPI_LINK_CMDLINE MPI_COMPILER_RETURN)
+
+      if (NOT MPI_COMPILER_RETURN EQUAL "0")
+        unset(MPI_COMPILE_CMDLINE)
+        unset(MPI_LINK_CMDLINE)
+      endif()
+    endif()
+  endif()
+
   # MPICH, MVAPICH2 and Intel MPI just use "-show". Open MPI also offers this, but the
   # -showme commands are more specialized.
-  if (NOT MPI_COMPILER_RETURN EQUAL 0)
+  if (NOT MPI_COMPILER_RETURN EQUAL "0")
     _MPI_check_compiler(${LANG} "-show" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
   endif()
 
   # Older versions of LAM/MPI have "-showme". Open MPI also supports this.
   # Unknown to MPICH, MVAPICH and Intel MPI.
-  if (NOT MPI_COMPILER_RETURN EQUAL 0)
+  if (NOT MPI_COMPILER_RETURN EQUAL "0")
     _MPI_check_compiler(${LANG} "-showme" MPI_COMPILE_CMDLINE MPI_COMPILER_RETURN)
   endif()
 
-  if (MPI_COMPILER_RETURN EQUAL 0 AND DEFINED MPI_COMPILE_CMDLINE)
+  if (MPI_COMPILER_RETURN EQUAL "0" AND DEFINED MPI_COMPILE_CMDLINE)
     # Intel MPI can be run with -compchk or I_MPI_CHECK_COMPILER set to 1.
     # In this case, -show will be prepended with a line to the compiler checker. This is a script that performs
     # compatibility checks and returns a non-zero exit code together with an error if something fails.
     # It has to be called as "compchk.sh <arch> <compiler>". Here, <arch> is one out of 32 (i686), 64 (ia64) or 32e (x86_64).
     # The compiler is identified by filename, and can be either the MPI compiler or the underlying compiler.
     # NOTE: It is vital to run this script while the environment variables are set up, otherwise it can check the wrong compiler.
-    if("${MPI_COMPILE_CMDLINE}" MATCHES "^([^\" ]+/compchk.sh|\"[^\"]+/compchk.sh\") +([^ ]+)")
+    if(MPI_COMPILE_CMDLINE MATCHES "^([^\" ]+/compchk.sh|\"[^\"]+/compchk.sh\") +([^ ]+)")
       # Now CMAKE_MATCH_1 contains the path to the compchk.sh file and CMAKE_MATCH_2 the architecture flag.
       unset(COMPILER_CHECKER_OUTPUT)
       execute_process(
@@ -516,7 +542,7 @@ function (_MPI_interrogate_compiler LANG)
       ERROR_VARIABLE   COMPILER_CHECKER_OUTPUT ERROR_STRIP_TRAILING_WHITESPACE
       RESULT_VARIABLE  MPI_COMPILER_RETURN)
       # If it returned a non-zero value, the check below will fail and cause the interrogation to be aborted.
-      if(NOT MPI_COMPILER_RETURN EQUAL 0)
+      if(NOT MPI_COMPILER_RETURN EQUAL "0")
         if(NOT MPI_FIND_QUIETLY)
           message(STATUS "Intel MPI compiler check failed: ${COMPILER_CHECKER_OUTPUT}")
         endif()
@@ -528,13 +554,13 @@ function (_MPI_interrogate_compiler LANG)
   endif()
 
   # Revert changes to the environment made previously
-  if("${LANG}" STREQUAL "C")
+  if(LANG STREQUAL "C")
     _MPI_env_unset_ifnot(I_MPI_CC)
     _MPI_env_unset_ifnot(MPICH_CC)
-  elseif("${LANG}" STREQUAL "CXX")
+  elseif(LANG STREQUAL "CXX")
     _MPI_env_unset_ifnot(I_MPI_CXX)
     _MPI_env_unset_ifnot(MPICH_CXX)
-  elseif("${LANG}" STREQUAL "Fortran")
+  elseif(LANG STREQUAL "Fortran")
     _MPI_env_unset_ifnot(I_MPI_FC)
     _MPI_env_unset_ifnot(MPICH_FC)
     _MPI_env_unset_ifnot(I_MPI_F77)
@@ -546,7 +572,7 @@ function (_MPI_interrogate_compiler LANG)
   _MPI_env_unset_ifnot(I_MPI_DEBUG_INFO_STRIP)
   _MPI_env_unset_ifnot(I_MPI_FORT_BIND)
 
-  if (NOT (MPI_COMPILER_RETURN EQUAL 0) OR NOT (DEFINED MPI_COMPILE_CMDLINE))
+  if (NOT (MPI_COMPILER_RETURN EQUAL "0") OR NOT (DEFINED MPI_COMPILE_CMDLINE))
     # Cannot interrogate this compiler, so exit.
     set(MPI_${LANG}_WRAPPER_FOUND FALSE PARENT_SCOPE)
     return()
@@ -587,13 +613,13 @@ function (_MPI_interrogate_compiler LANG)
   if(UNIX)
     # At this point, we obtained some output from a compiler wrapper that works.
     # We'll now try to parse it into variables with meaning to us.
-    if("${LANG}" STREQUAL "Fortran")
+    if(LANG STREQUAL "Fortran")
       # If MPICH (and derivates) didn't recognize the Fortran compiler include flag during configuration,
       # they'll return a set of three commands, consisting out of a symlink command for mpif.h,
       # the actual compiler command and deletion of the created symlink.
       # Especially with M(VA)PICH-1, this appears to happen erroneously, and therefore we should translate
       # this output into an additional include directory and then drop it from the output.
-      if("${MPI_COMPILE_CMDLINE}" MATCHES "^ln -s ([^\" ]+|\"[^\"]+\") mpif.h")
+      if(MPI_COMPILE_CMDLINE MATCHES "^ln -s ([^\" ]+|\"[^\"]+\") mpif.h")
         get_filename_component(MPI_INCLUDE_DIRS_WORK "${CMAKE_MATCH_1}" DIRECTORY)
         string(REGEX REPLACE "^ln -s ([^\" ]+|\"[^\"]+\") mpif.h\n" "" MPI_COMPILE_CMDLINE "${MPI_COMPILE_CMDLINE}")
         string(REGEX REPLACE "^ln -s ([^\" ]+|\"[^\"]+\") mpif.h\n" "" MPI_LINK_CMDLINE "${MPI_LINK_CMDLINE}")
@@ -624,7 +650,8 @@ function (_MPI_interrogate_compiler LANG)
       # we won't match the accompanying --param-ssp-size and -Wp,-D_FORTIFY_SOURCE flags and therefore
       # produce inconsistent results with the regularly flags.
       # Similarly, aliasing flags do not belong into our flag array.
-      if(NOT "${_MPI_COMPILE_OPTION}" MATCHES "^-f((no-|)(stack-protector|strict-aliasing)|PI[CE]|pi[ce])")
+      # Also strip out `-framework` flags.
+      if(NOT _MPI_COMPILE_OPTION MATCHES "^-f((no-|)(stack-protector|strict-aliasing)|PI[CE]|pi[ce]|ramework)")
         list(APPEND MPI_COMPILE_OPTIONS_WORK "${_MPI_COMPILE_OPTION}")
       endif()
     endforeach()
@@ -646,7 +673,7 @@ function (_MPI_interrogate_compiler LANG)
   foreach(_MPI_COMPILE_DEFINITION IN LISTS MPI_ALL_COMPILE_DEFINITIONS)
     string(REGEX REPLACE "^ ?${_MPI_PREPROCESSOR_FLAG_REGEX}-D *" "" _MPI_COMPILE_DEFINITION "${_MPI_COMPILE_DEFINITION}")
     string(REPLACE "\"" "" _MPI_COMPILE_DEFINITION "${_MPI_COMPILE_DEFINITION}")
-    if(NOT "${_MPI_COMPILE_DEFINITION}" MATCHES "^_FORTIFY_SOURCE.*")
+    if(NOT _MPI_COMPILE_DEFINITION MATCHES "^_FORTIFY_SOURCE.*")
       list(APPEND MPI_COMPILE_DEFINITIONS_WORK "${_MPI_COMPILE_DEFINITION}")
     endif()
   endforeach()
@@ -748,7 +775,8 @@ function (_MPI_interrogate_compiler LANG)
       MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
 
     foreach(_MPI_LIB_NAME IN LISTS MPI_LIBNAMES)
-      string(REGEX REPLACE "^ ?${CMAKE_LINK_LIBRARY_FLAG}" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
+      # also match flags starting with "-l:" here
+      string(REGEX REPLACE "^ ?${CMAKE_LINK_LIBRARY_FLAG}(:lib|:)?" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
       string(REPLACE "\"" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
       list(APPEND MPI_LIB_NAMES_WORK "${_MPI_LIB_NAME}")
     endforeach()
@@ -760,8 +788,8 @@ function (_MPI_interrogate_compiler LANG)
   # decide how to link it based on file type, not based on a prefix like 'lib'.
   set(_MPI_LIB_SUFFIX_REGEX "${CMAKE_STATIC_LIBRARY_SUFFIX}")
   if(DEFINED CMAKE_IMPORT_LIBRARY_SUFFIX)
-    if(NOT ("${CMAKE_IMPORT_LIBRARY_SUFFIX}" STREQUAL "${CMAKE_STATIC_LIBRARY_SUFFIX}"))
-      string(APPEND _MPI_SUFFIX_REGEX "|${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+    if(NOT (CMAKE_IMPORT_LIBRARY_SUFFIX STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX))
+      string(APPEND _MPI_LIB_SUFFIX_REGEX "|${CMAKE_IMPORT_LIBRARY_SUFFIX}")
     endif()
   else()
     string(APPEND _MPI_LIB_SUFFIX_REGEX "|${CMAKE_SHARED_LIBRARY_SUFFIX}")
@@ -771,12 +799,16 @@ function (_MPI_interrogate_compiler LANG)
 
   string(REGEX MATCHALL "${_MPI_LIB_NAME_REGEX}" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
   foreach(_MPI_LIB_NAME IN LISTS MPI_LIBNAMES)
-    string(REGEX REPLACE "^ +\"?|\"? +$" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
-    get_filename_component(_MPI_LIB_PATH "${_MPI_LIB_NAME}" DIRECTORY)
-    if(NOT "${_MPI_LIB_PATH}" STREQUAL "")
-      list(APPEND MPI_LIB_FULLPATHS_WORK "${_MPI_LIB_NAME}")
-    else()
-      list(APPEND MPI_LIB_NAMES_WORK "${_MPI_LIB_NAME}")
+    # Do not match "-l:" flags
+    string(REGEX MATCH "^ ?${CMAKE_LINK_LIBRARY_FLAG}:" _MPI_LIB_NAME_TEST "${_MPI_LIB_NAME}")
+    if(_MPI_LIB_NAME_TEST STREQUAL "")
+      string(REGEX REPLACE "^ +\"?|\"? +$" "" _MPI_LIB_NAME "${_MPI_LIB_NAME}")
+      get_filename_component(_MPI_LIB_PATH "${_MPI_LIB_NAME}" DIRECTORY)
+      if(NOT _MPI_LIB_PATH STREQUAL "")
+        list(APPEND MPI_LIB_FULLPATHS_WORK "${_MPI_LIB_NAME}")
+      else()
+        list(APPEND MPI_LIB_NAMES_WORK "${_MPI_LIB_NAME}")
+      endif()
     endif()
   endforeach()
 
@@ -813,7 +845,7 @@ function (_MPI_interrogate_compiler LANG)
     foreach(_MPI_LINK_DIRECTORY IN LISTS MPI_LINK_DIRECTORIES_LEFTOVER)
       file(TO_NATIVE_PATH "${_MPI_LINK_DIRECTORY}" _MPI_LINK_DIRECTORY_ACTUAL)
       string(FIND "${_MPI_LINK_DIRECTORY_ACTUAL}" " " _MPI_LINK_DIRECTORY_CONTAINS_SPACE)
-      if(NOT _MPI_LINK_DIRECTORY_CONTAINS_SPACE EQUAL -1)
+      if(NOT _MPI_LINK_DIRECTORY_CONTAINS_SPACE EQUAL "-1")
         set(_MPI_LINK_DIRECTORY_ACTUAL "\"${_MPI_LINK_DIRECTORY_ACTUAL}\"")
       endif()
       if(MPI_LINK_FLAGS_WORK)
@@ -839,7 +871,7 @@ function (_MPI_interrogate_compiler LANG)
 
   # MPI might require pthread to work. The above mechanism wouldn't detect it, but we need to
   # link it in that case. -lpthread is covered by the normal library treatment on the other hand.
-  if("${MPI_COMPILE_CMDLINE}" MATCHES "-pthread")
+  if(MPI_COMPILE_CMDLINE MATCHES "-pthread")
     list(APPEND MPI_COMPILE_OPTIONS_WORK "-pthread")
     if(MPI_LINK_FLAGS_WORK)
       string(APPEND MPI_LINK_FLAGS_WORK " -pthread")
@@ -886,10 +918,10 @@ function(_MPI_guess_settings LANG)
     # The environment variables MSMPI_INC and MSMPILIB32/64 are the only ways of locating the MSMPI_SDK,
     # which is installed separately from the runtime. Thus it's possible to have mpiexec but not MPI headers
     # or import libraries and vice versa.
-    if(NOT MPI_GUESS_LIBRARY_NAME OR "${MPI_GUESS_LIBRARY_NAME}" STREQUAL "MSMPI")
+    if(NOT MPI_GUESS_LIBRARY_NAME OR MPI_GUESS_LIBRARY_NAME STREQUAL "MSMPI")
       # We first attempt to locate the msmpi.lib. Should be find it, we'll assume that the MPI present is indeed
       # Microsoft MPI.
-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
+      if(CMAKE_SIZEOF_VOID_P EQUAL "8")
         file(TO_CMAKE_PATH "$ENV{MSMPI_LIB64}" MPI_MSMPI_LIB_PATH)
         file(TO_CMAKE_PATH "$ENV{MSMPI_INC}/x64" MPI_MSMPI_INC_PATH_EXTRA)
       else()
@@ -943,9 +975,9 @@ function(_MPI_guess_settings LANG)
         # Our strategy is now to locate all libraries, but enter msmpifec into the LIB_NAMES array.
         # Should this not be adequate it's a straightforward way for a user to change the LIB_NAMES array and
         # have his library found. Still, this should not be necessary outside of exceptional cases, as reasoned.
-        if ("${LANG}" STREQUAL "Fortran")
+        if (LANG STREQUAL "Fortran")
           set(MPI_MSMPI_CALLINGCONVS c)
-          if("${CMAKE_SIZEOF_VOID_P}" EQUAL 4)
+          if(CMAKE_SIZEOF_VOID_P EQUAL "4")
             list(APPEND MPI_MSMPI_CALLINGCONVS s)
           endif()
           foreach(mpistrlenpos IN ITEMS e m)
@@ -993,7 +1025,7 @@ function(_MPI_guess_settings LANG)
     # At this point there's not many MPIs that we could still consider.
     # OpenMPI 1.6.x and below supported Windows, but these ship compiler wrappers that still work.
     # The only other relevant MPI implementation without a wrapper is MPICH2, which had Windows support in 1.4.1p1 and older.
-    if(NOT MPI_GUESS_FOUND AND (NOT MPI_GUESS_LIBRARY_NAME OR "${MPI_GUESS_LIBRARY_NAME}" STREQUAL "MPICH2"))
+    if(NOT MPI_GUESS_FOUND AND (NOT MPI_GUESS_LIBRARY_NAME OR MPI_GUESS_LIBRARY_NAME STREQUAL "MPICH2"))
       set(MPI_MPICH_PREFIX_PATHS
         "$ENV{ProgramW6432}/MPICH2/lib"
         "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/../lib"
@@ -1010,7 +1042,7 @@ function(_MPI_guess_settings LANG)
         set(MPI_MPICH_LIB_NAMES "mpi")
         # If MPI-2 C++ bindings are requested, we need to locate cxx.lib as well.
         # Otherwise, MPICH_SKIP_MPICXX will be defined and these bindings aren't needed.
-        if("${LANG}" STREQUAL "CXX" AND NOT MPI_CXX_SKIP_MPICXX)
+        if(LANG STREQUAL "CXX" AND NOT MPI_CXX_SKIP_MPICXX)
           find_library(MPI_cxx_LIBRARY
             NAMES cxx
             HINTS ${MPI_MPICH_PREFIX_PATHS})
@@ -1023,7 +1055,7 @@ function(_MPI_guess_settings LANG)
         # fmpich2s.lib would be useful for Compaq Visual Fortran, fmpich2g.lib has to be used with GNU g77 and is also
         # provided in the form of an .a archive for MinGW and Cygwin. From our perspective, fmpich2.lib is the only one
         # we need to try, and if it doesn't work with the given Fortran compiler we'd find out later on during validation
-        elseif("${LANG}" STREQUAL "Fortran")
+        elseif(LANG STREQUAL "Fortran")
           find_library(MPI_fmpich2_LIBRARY
             NAMES fmpich2
             HINTS ${MPI_MPICH_PREFIX_PATHS})
@@ -1071,7 +1103,7 @@ function(_MPI_guess_settings LANG)
 endfunction()
 
 function(_MPI_adjust_compile_definitions LANG)
-  if("${LANG}" STREQUAL "CXX")
+  if(LANG STREQUAL "CXX")
     # To disable the C++ bindings, we need to pass some definitions since the mpi.h header has to deal with both C and C++
     # bindings in MPI-2.
     if(MPI_CXX_SKIP_MPICXX AND NOT MPI_${LANG}_COMPILE_DEFINITIONS MATCHES "SKIP_MPICXX")
@@ -1087,7 +1119,7 @@ endfunction()
 macro(_MPI_assemble_libraries LANG)
   set(MPI_${LANG}_LIBRARIES "")
   # Only for libraries do we need to check whether the compiler's linking stage is separate.
-  if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}" OR NOT MPI_${LANG}_WORKS_IMPLICIT)
+  if(NOT MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER OR NOT MPI_${LANG}_WORKS_IMPLICIT)
     foreach(mpilib IN LISTS MPI_${LANG}_LIB_NAMES)
       list(APPEND MPI_${LANG}_LIBRARIES ${MPI_${mpilib}_LIBRARY})
     endforeach()
@@ -1099,7 +1131,7 @@ macro(_MPI_assemble_include_dirs LANG)
     ${MPI_${LANG}_COMPILER_INCLUDE_DIRS}
     ${MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS}
     )
-  if("${LANG}" MATCHES "(C|CXX)")
+  if(LANG MATCHES "^(C|CXX)$")
     if(MPI_${LANG}_HEADER_DIR)
       list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${LANG}_HEADER_DIR}")
     endif()
@@ -1124,7 +1156,7 @@ macro(_MPI_split_include_dirs LANG)
 
   # We try to find the headers/modules among those paths (and system paths)
   # For C/C++, we just need to have a look for mpi.h.
-  if("${LANG}" MATCHES "(C|CXX)")
+  if(LANG MATCHES "^(C|CXX)$")
     find_path(MPI_${LANG}_HEADER_DIR "mpi.h"
       HINTS
         ${MPI_${LANG}_COMPILER_INCLUDE_DIRS}
@@ -1139,7 +1171,7 @@ macro(_MPI_split_include_dirs LANG)
   # any of the Fortran 77/90/2008 APIs for MPI. For example, MSMPI
   # only provides Fortran 77 and - if mpi.f90 is built - potentially
   # a Fortran 90 module.
-  elseif("${LANG}" STREQUAL "Fortran")
+  elseif(LANG STREQUAL "Fortran")
     find_path(MPI_${LANG}_F77_HEADER_DIR "mpif.h"
       HINTS
         ${MPI_${LANG}_COMPILER_INCLUDE_DIRS}
@@ -1206,28 +1238,30 @@ function(_MPI_try_staged_settings LANG MPI_TEST_FILE_NAME MODE RUN_BINARY SUPPRE
   set(SRC_DIR "${CMAKE_ROOT}/Modules/FindMPI")
   set(BIN_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindMPI/${MPI_TEST_FILE_NAME}_${LANG}.bin")
   unset(MPI_TEST_COMPILE_DEFINITIONS)
-  if("${LANG}" STREQUAL "Fortran")
-    if("${MODE}" STREQUAL "F90_MODULE")
+  if(LANG STREQUAL "Fortran")
+    if(MODE STREQUAL "F90_MODULE")
       set(MPI_Fortran_INCLUDE_LINE "use mpi\n      implicit none")
-    elseif("${MODE}" STREQUAL "F08_MODULE")
+    elseif(MODE STREQUAL "F08_MODULE")
       set(MPI_Fortran_INCLUDE_LINE "use mpi_f08\n      implicit none")
     else() # F77 header
       set(MPI_Fortran_INCLUDE_LINE "implicit none\n      include 'mpif.h'")
     endif()
-    configure_file("${SRC_DIR}/${MPI_TEST_FILE_NAME}.f90.in" "${WORK_DIR}/${MPI_TEST_FILE_NAME}.f90" @ONLY)
-    set(MPI_TEST_SOURCE_FILE "${WORK_DIR}/${MPI_TEST_FILE_NAME}.f90")
-  elseif("${LANG}" STREQUAL "CXX")
-    configure_file("${SRC_DIR}/${MPI_TEST_FILE_NAME}.c" "${WORK_DIR}/${MPI_TEST_FILE_NAME}.cpp" COPYONLY)
-    set(MPI_TEST_SOURCE_FILE "${WORK_DIR}/${MPI_TEST_FILE_NAME}.cpp")
-    if("${MODE}" STREQUAL "TEST_MPICXX")
+    file(READ "${SRC_DIR}/${MPI_TEST_FILE_NAME}.f90.in" MPI_TEST_SOURCE_CONTENT)
+    string(CONFIGURE "${MPI_TEST_SOURCE_CONTENT}" MPI_TEST_SOURCE_CONTENT)
+    set(MPI_TEST_SOURCE_FILE "${MPI_TEST_FILE_NAME}.f90")
+  elseif(LANG STREQUAL "CXX")
+    file(READ "${SRC_DIR}/${MPI_TEST_FILE_NAME}.c" MPI_TEST_SOURCE_CONTENT)
+    set(MPI_TEST_SOURCE_FILE "${MPI_TEST_FILE_NAME}.cpp")
+    if(MODE STREQUAL "TEST_MPICXX")
       set(MPI_TEST_COMPILE_DEFINITIONS TEST_MPI_MPICXX)
     endif()
   else() # C
-    set(MPI_TEST_SOURCE_FILE "${SRC_DIR}/${MPI_TEST_FILE_NAME}.c")
+    file(READ "${SRC_DIR}/${MPI_TEST_FILE_NAME}.c" MPI_TEST_SOURCE_CONTENT)
+    set(MPI_TEST_SOURCE_FILE "${MPI_TEST_FILE_NAME}.c")
   endif()
   if(RUN_BINARY)
     try_run(MPI_RUN_RESULT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE} MPI_RESULT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE}
-     "${CMAKE_BINARY_DIR}" SOURCES "${MPI_TEST_SOURCE_FILE}"
+      SOURCE_FROM_VAR "${MPI_TEST_SOURCE_FILE}" MPI_TEST_SOURCE_CONTENT
       COMPILE_DEFINITIONS ${MPI_TEST_COMPILE_DEFINITIONS}
       LINK_LIBRARIES MPI::MPI_${LANG}
       RUN_OUTPUT_VARIABLE MPI_RUN_OUTPUT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE}
@@ -1235,7 +1269,7 @@ function(_MPI_try_staged_settings LANG MPI_TEST_FILE_NAME MODE RUN_BINARY SUPPRE
     set(MPI_RUN_OUTPUT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE} "${MPI_RUN_OUTPUT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE}}" PARENT_SCOPE)
   else()
     try_compile(MPI_RESULT_${LANG}_${MPI_TEST_FILE_NAME}_${MODE}
-      "${CMAKE_BINARY_DIR}" SOURCES "${MPI_TEST_SOURCE_FILE}"
+      SOURCE_FROM_VAR "${MPI_TEST_SOURCE_FILE}" MPI_TEST_SOURCE_CONTENT
       COMPILE_DEFINITIONS ${MPI_TEST_COMPILE_DEFINITIONS}
       LINK_LIBRARIES MPI::MPI_${LANG}
       COPY_FILE "${BIN_FILE}"
@@ -1258,7 +1292,7 @@ macro(_MPI_check_lang_works LANG SUPPRESS_ERRORS)
   #   - *both*, the mpi module and 'mpif.h'
   # Since older MPI standards (MPI-1) did not define anything but 'mpif.h', we need to check all three individually.
   if( NOT MPI_${LANG}_WORKS )
-    if("${LANG}" STREQUAL "Fortran")
+    if(LANG STREQUAL "Fortran")
       set(MPI_Fortran_INTEGER_LINE "(kind=MPI_INTEGER_KIND)")
       _MPI_try_staged_settings(${LANG} test_mpi F77_HEADER FALSE ${SUPPRESS_ERRORS})
       _MPI_try_staged_settings(${LANG} test_mpi F90_MODULE FALSE ${SUPPRESS_ERRORS})
@@ -1307,11 +1341,11 @@ macro(MPI_search_mpi_prefix_folder PREFIX_FOLDER)
 endmacro()
 
 set(MPI_HINT_DIRS ${MPI_HOME} $ENV{MPI_HOME} $ENV{I_MPI_ROOT})
-if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
   # SUSE Linux Enterprise Server stores its MPI implementations under /usr/lib64/mpi/gcc/<name>
   # We enumerate the subfolders and append each as a prefix
   MPI_search_mpi_prefix_folder("/usr/lib64/mpi/gcc")
-elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "FreeBSD")
+elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
   # FreeBSD ships mpich under the normal system paths - but available openmpi implementations
   # will be found in /usr/local/mpi/<name>
   MPI_search_mpi_prefix_folder("/usr/local/mpi")
@@ -1378,7 +1412,7 @@ if(NOT MPI_IGNORE_LEGACY_VARIABLES)
     if(MPI_${LANG}_COMPILE_FLAGS)
       separate_arguments(MPI_SEPARATE_FLAGS NATIVE_COMMAND "${MPI_${LANG}_COMPILE_FLAGS}")
       foreach(_MPI_FLAG IN LISTS MPI_SEPARATE_FLAGS)
-        if("${_MPI_FLAG}" MATCHES "^ *-D([^ ]+)")
+        if(_MPI_FLAG MATCHES "^ *-D([^ ]+)")
           list(APPEND MPI_${LANG}_EXTRA_COMPILE_DEFINITIONS "${CMAKE_MATCH_1}")
         else()
           list(APPEND MPI_${LANG}_EXTRA_COMPILE_OPTIONS "${_MPI_FLAG}")
@@ -1425,24 +1459,25 @@ foreach(LANG IN ITEMS C CXX Fortran)
   if(CMAKE_${LANG}_COMPILER_LOADED)
     if(NOT MPI_FIND_COMPONENTS)
       set(_MPI_FIND_${LANG} TRUE)
-    elseif( ${LANG} IN_LIST MPI_FIND_COMPONENTS)
+    elseif( LANG IN_LIST MPI_FIND_COMPONENTS)
       set(_MPI_FIND_${LANG} TRUE)
-    elseif( ${LANG} STREQUAL CXX AND NOT MPI_CXX_SKIP_MPICXX AND MPICXX IN_LIST MPI_FIND_COMPONENTS )
+    elseif( LANG STREQUAL "CXX" AND NOT MPI_CXX_SKIP_MPICXX AND MPICXX IN_LIST MPI_FIND_COMPONENTS )
       set(_MPI_FIND_${LANG} TRUE)
     else()
       set(_MPI_FIND_${LANG} FALSE)
     endif()
   else()
     set(_MPI_FIND_${LANG} FALSE)
-    if(${LANG} IN_LIST MPI_FIND_COMPONENTS)
+    if(LANG IN_LIST MPI_FIND_COMPONENTS)
       string(APPEND _MPI_FAIL_REASON "MPI component '${LANG}' was requested, but language ${LANG} is not enabled.  ")
     endif()
   endif()
   if(_MPI_FIND_${LANG})
-    if( ${LANG} STREQUAL CXX AND NOT MPICXX IN_LIST MPI_FIND_COMPONENTS )
-      set(MPI_CXX_SKIP_MPICXX FALSE CACHE BOOL "If true, the MPI-2 C++ bindings are disabled using definitions.")
+    if( LANG STREQUAL "CXX" AND NOT MPICXX IN_LIST MPI_FIND_COMPONENTS )
+      option(MPI_CXX_SKIP_MPICXX "If true, the MPI-2 C++ bindings are disabled using definitions." FALSE)
       mark_as_advanced(MPI_CXX_SKIP_MPICXX)
     endif()
+    _MPI_adjust_compile_definitions(${LANG})
     if(NOT (MPI_${LANG}_LIB_NAMES AND (MPI_${LANG}_INCLUDE_PATH OR MPI_${LANG}_INCLUDE_DIRS OR MPI_${LANG}_COMPILER_INCLUDE_DIRS)))
       set(MPI_${LANG}_TRIED_IMPLICIT FALSE)
       set(MPI_${LANG}_WORKS_IMPLICIT FALSE)
@@ -1460,7 +1495,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
         set(MPI_${LANG}_TRIED_IMPLICIT TRUE)
       endif()
 
-      if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}" OR NOT MPI_${LANG}_WORKS)
+      if(NOT MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER OR NOT MPI_${LANG}_WORKS)
         set(MPI_${LANG}_WRAPPER_FOUND FALSE)
         set(MPI_PINNED_COMPILER FALSE)
 
@@ -1496,7 +1531,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
             DOC    "MPI compiler for ${LANG}"
           )
 
-          if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
+          if(MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER)
             set(MPI_PINNED_COMPILER TRUE)
 
             # If we haven't made the implicit compiler test yet, perform it now.
@@ -1519,13 +1554,69 @@ foreach(LANG IN ITEMS C CXX Fortran)
           endif()
         endif()
 
+        # We are on a Cray, environment identfier: PE_ENV is set (CRAY), and
+        # have NOT found an mpic++-like compiler wrapper (previous block),
+        # and we do NOT use the Cray cc/CC compiler wrappers as CC/CXX CMake
+        # compiler.
+        # So as a last resort, we now interrogate cc/CC/ftn for MPI flags.
+        if(DEFINED ENV{PE_ENV} AND NOT "${MPI_${LANG}_COMPILER}")
+          set(MPI_PINNED_COMPILER TRUE)
+          find_program(MPI_${LANG}_COMPILER
+            NAMES  ${_MPI_Cray_${LANG}_COMPILER_NAMES}
+            PATH_SUFFIXES bin sbin
+            DOC    "MPI compiler for ${LANG}"
+          )
+
+          # If we haven't made the implicit compiler test yet, perform it now.
+          if(NOT MPI_${LANG}_TRIED_IMPLICIT)
+            _MPI_create_imported_target(${LANG})
+            _MPI_check_lang_works(${LANG} TRUE)
+          endif()
+
+          set(MPI_${LANG}_WORKS_IMPLICIT TRUE)
+          _MPI_interrogate_compiler(${LANG})
+        endif()
+
         if(NOT MPI_PINNED_COMPILER AND NOT MPI_${LANG}_WRAPPER_FOUND)
           # If MPI_PINNED_COMPILER wasn't given, and the MPI compiler we potentially found didn't work, we withdraw it.
           set(MPI_${LANG}_COMPILER "MPI_${LANG}_COMPILER-NOTFOUND" CACHE FILEPATH "MPI compiler for ${LANG}" FORCE)
-          if(NOT MPI_SKIP_GUESSING)
+
+          if(LANG STREQUAL "C")
+            set(_MPI_PKG "mpi-c")
+          elseif(LANG STREQUAL "CXX")
+            set(_MPI_PKG "mpi-cxx")
+          elseif(LANG STREQUAL "Fortran")
+            set(_MPI_PKG "mpi-fort")
+          else()
+            set(_MPI_PKG "")
+          endif()
+          if(_MPI_PKG AND PKG_CONFIG_FOUND)
+            pkg_check_modules("MPI_${LANG}_PKG" "${_MPI_PKG}")
+            if(MPI_${LANG}_PKG_FOUND)
+              set(MPI_${LANG}_COMPILE_OPTIONS  ${MPI_${LANG}_PKG_CFLAGS}        CACHE STRING "MPI ${LANG} compilation options"       FORCE)
+              set(MPI_${LANG}_INCLUDE_PATH     ${MPI_${LANG}_PKG_INCLUDE_DIRS}  CACHE STRING "MPI ${LANG} include directories"       FORCE)
+              set(MPI_${LANG}_LINK_FLAGS       ${MPI_${LANG}_PKG_LDFLAGS}       CACHE STRING "MPI ${LANG} linker flags"              FORCE)
+              set(MPI_${LANG}_LIB_NAMES        ${MPI_${LANG}_PKG_LIBRARIES}     CACHE STRING "MPI ${LANG} libraries to link against" FORCE)
+              foreach(_MPI_LIB IN LISTS MPI_${LANG}_LIB_NAMES)
+                if(_MPI_LIB)
+                  get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB}" NAME_WE)
+                  get_filename_component(_MPI_LIB_NAME "${_MPI_LIB}" NAME)
+                  get_filename_component(_MPI_LIB_DIR "${_MPI_LIB}" DIRECTORY)
+                  find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY
+                    NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}"
+                    HINTS ${_MPI_LIB_DIR}
+                    DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI"
+                  )
+                  mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY)
+                endif()
+              endforeach()
+            endif()
+          endif()
+
+          if(NOT MPI_SKIP_GUESSING AND NOT MPI_${LANG}_PKG_FOUND)
             # For C++, we may use the settings for C. Should a given compiler wrapper for C++ not exist, but one for C does, we copy over the
             # settings for C. An MPI distribution that is in this situation would be IBM Platform MPI.
-            if("${LANG}" STREQUAL "CXX" AND MPI_C_WRAPPER_FOUND)
+            if(LANG STREQUAL "CXX" AND MPI_C_WRAPPER_FOUND)
               set(MPI_${LANG}_COMPILE_OPTIONS          ${MPI_C_COMPILE_OPTIONS}     CACHE STRING "MPI ${LANG} compilation options"           )
               set(MPI_${LANG}_COMPILE_DEFINITIONS      ${MPI_C_COMPILE_DEFINITIONS} CACHE STRING "MPI ${LANG} compilation definitions"       )
               set(MPI_${LANG}_COMPILER_INCLUDE_DIRS    ${MPI_C_INCLUDE_DIRS}        CACHE STRING "MPI ${LANG} compiler wrapper include directories")
@@ -1539,7 +1630,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
       endif()
     endif()
 
-    if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
+    if(NOT MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER)
       _MPI_split_include_dirs(${LANG})
       _MPI_assemble_include_dirs(${LANG})
     else()
@@ -1547,7 +1638,6 @@ foreach(LANG IN ITEMS C CXX Fortran)
     endif()
     _MPI_assemble_libraries(${LANG})
 
-    _MPI_adjust_compile_definitions(${LANG})
     # We always create imported targets even if they're empty
     _MPI_create_imported_target(${LANG})
 
@@ -1577,7 +1667,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
     # If we've found MPI, then we'll perform additional analysis: Determine the MPI version, MPI library version, supported
     # MPI APIs (i.e. MPI-2 C++ bindings). For Fortran we also need to find specific parameters if we're under MPI-3.
     if(MPI_${LANG}_WORKS)
-      if("${LANG}" STREQUAL "CXX" AND NOT DEFINED MPI_MPICXX_FOUND)
+      if(LANG STREQUAL "CXX" AND NOT DEFINED MPI_MPICXX_FOUND)
         if(NOT MPI_CXX_SKIP_MPICXX AND NOT MPI_CXX_VALIDATE_SKIP_MPICXX)
           _MPI_try_staged_settings(${LANG} test_mpi MPICXX FALSE FALSE)
           if(MPI_RESULT_${LANG}_test_mpi_MPICXX)
@@ -1601,7 +1691,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
       # Fortran parameters, since those depend on the method of consumption.
       # For C++, we can always use the C bindings, and should do so, since the C++ bindings do not exist in MPI-3
       # whereas the C bindings do, and the C++ bindings never offered any feature advantage over their C counterparts.
-      if("${LANG}" STREQUAL "Fortran")
+      if(LANG STREQUAL "Fortran")
         if(MPI_${LANG}_HAVE_F08_MODULE)
           set(MPI_${LANG}_HIGHEST_METHOD F08_MODULE)
         elseif(MPI_${LANG}_HAVE_F90_MODULE)
@@ -1617,7 +1707,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
           _MPI_try_staged_settings(${LANG} mpiver ${MPI_${LANG}_HIGHEST_METHOD} FALSE FALSE)
           if(MPI_RESULT_${LANG}_mpiver_${MPI_${LANG}_HIGHEST_METHOD})
             file(STRINGS ${MPI_BIN_FOLDER}/mpiver_${LANG}.bin _MPI_VERSION_STRING LIMIT_COUNT 1 REGEX "INFO:MPI-VER")
-            if("${_MPI_VERSION_STRING}" MATCHES ".*INFO:MPI-VER\\[([0-9]+)\\.([0-9]+)\\].*")
+            if(_MPI_VERSION_STRING MATCHES ".*INFO:MPI-VER\\[([0-9]+)\\.([0-9]+)\\].*")
               set(MPI_${LANG}_VERSION_MAJOR "${CMAKE_MATCH_1}")
               set(MPI_${LANG}_VERSION_MINOR "${CMAKE_MATCH_2}")
               set(MPI_${LANG}_VERSION "${MPI_${LANG}_VERSION_MAJOR}.${MPI_${LANG}_VERSION_MINOR}")
@@ -1636,12 +1726,12 @@ foreach(LANG IN ITEMS C CXX Fortran)
               _MPI_try_staged_settings(${LANG} fortranparam_mpi ${mpimethod} TRUE FALSE)
               if(MPI_RESULT_${LANG}_fortranparam_mpi_${mpimethod} AND
                 NOT "${MPI_RUN_RESULT_${LANG}_fortranparam_mpi_${mpimethod}}" STREQUAL "FAILED_TO_RUN")
-                if("${MPI_RUN_OUTPUT_${LANG}_fortranparam_mpi_${mpimethod}}" MATCHES
+                if(MPI_RUN_OUTPUT_${LANG}_fortranparam_mpi_${mpimethod} MATCHES
                   ".*INFO:SUBARRAYS\\[ *([TF]) *\\]-ASYNCPROT\\[ *([TF]) *\\].*")
-                  if("${CMAKE_MATCH_1}" STREQUAL "T")
+                  if(CMAKE_MATCH_1 STREQUAL "T")
                     set(MPI_${LANG}_${mpimethod}_SUBARRAYS TRUE)
                   endif()
-                  if("${CMAKE_MATCH_2}" STREQUAL "T")
+                  if(CMAKE_MATCH_2 STREQUAL "T")
                     set(MPI_${LANG}_${mpimethod}_ASYNCPROT TRUE)
                   endif()
                 endif()
@@ -1656,7 +1746,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
         # By the MPI-2 standard, MPI_VERSION and MPI_SUBVERSION are valid for both C and C++ bindings.
         if(NOT DEFINED MPI_${LANG}_VERSION)
           file(STRINGS ${MPI_BIN_FOLDER}/test_mpi_${LANG}.bin _MPI_VERSION_STRING LIMIT_COUNT 1 REGEX "INFO:MPI-VER")
-          if("${_MPI_VERSION_STRING}" MATCHES ".*INFO:MPI-VER\\[([0-9]+)\\.([0-9]+)\\].*")
+          if(_MPI_VERSION_STRING MATCHES ".*INFO:MPI-VER\\[([0-9]+)\\.([0-9]+)\\].*")
             set(MPI_${LANG}_VERSION_MAJOR "${CMAKE_MATCH_1}")
             set(MPI_${LANG}_VERSION_MINOR "${CMAKE_MATCH_2}")
             set(MPI_${LANG}_VERSION "${MPI_${LANG}_VERSION_MAJOR}.${MPI_${LANG}_VERSION_MINOR}")
@@ -1676,7 +1766,7 @@ foreach(LANG IN ITEMS C CXX Fortran)
       if(MPI_DETERMINE_LIBRARY_VERSION AND NOT MPI_${LANG}_LIBRARY_VERSION_STRING)
         _MPI_try_staged_settings(${LANG} libver_mpi ${MPI_${LANG}_HIGHEST_METHOD} TRUE FALSE)
         if(MPI_RESULT_${LANG}_libver_mpi_${MPI_${LANG}_HIGHEST_METHOD} AND
-          "${MPI_RUN_RESULT_${LANG}_libver_mpi_${MPI_${LANG}_HIGHEST_METHOD}}" EQUAL "0")
+          MPI_RUN_RESULT_${LANG}_libver_mpi_${MPI_${LANG}_HIGHEST_METHOD} EQUAL "0")
           string(STRIP "${MPI_RUN_OUTPUT_${LANG}_libver_mpi_${MPI_${LANG}_HIGHEST_METHOD}}"
             MPI_${LANG}_LIBRARY_VERSION_STRING)
         else()
@@ -1690,12 +1780,12 @@ foreach(LANG IN ITEMS C CXX Fortran)
     set(MPI_${LANG}_FIND_VERSION_EXACT ${MPI_FIND_VERSION_EXACT})
 
     unset(MPI_${LANG}_REQUIRED_VARS)
-    if (NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
+    if (NOT MPI_${LANG}_COMPILER STREQUAL CMAKE_${LANG}_COMPILER)
       foreach(mpilibname IN LISTS MPI_${LANG}_LIB_NAMES)
         list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${mpilibname}_LIBRARY")
       endforeach()
       list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_LIB_NAMES")
-      if("${LANG}" STREQUAL "Fortran")
+      if(LANG STREQUAL "Fortran")
         # For Fortran we only need one of the module or header directories to have *some* support for MPI.
         if(NOT MPI_${LANG}_MODULE_DIR)
           list(APPEND MPI_${LANG}_REQUIRED_VARS "MPI_${LANG}_F77_HEADER_DIR")
@@ -1795,7 +1885,7 @@ else()
 endif()
 
 list(LENGTH MPI_LIBRARIES MPI_NUMLIBS)
-if (MPI_NUMLIBS GREATER 1)
+if (MPI_NUMLIBS GREATER "1")
   set(MPI_EXTRA_LIBRARY_WORK "${MPI_LIBRARIES}")
   list(REMOVE_AT MPI_EXTRA_LIBRARY_WORK 0)
   set(MPI_EXTRA_LIBRARY "${MPI_EXTRA_LIBRARY_WORK}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPI/fortranparam_mpi.f90.in b/deps/cmake/share/cmake-3.25/Modules/FindMPI/fortranparam_mpi.f90.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPI/fortranparam_mpi.f90.in
rename to deps/cmake/share/cmake-3.25/Modules/FindMPI/fortranparam_mpi.f90.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPI/libver_mpi.c b/deps/cmake/share/cmake-3.25/Modules/FindMPI/libver_mpi.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPI/libver_mpi.c
rename to deps/cmake/share/cmake-3.25/Modules/FindMPI/libver_mpi.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPI/libver_mpi.f90.in b/deps/cmake/share/cmake-3.25/Modules/FindMPI/libver_mpi.f90.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPI/libver_mpi.f90.in
rename to deps/cmake/share/cmake-3.25/Modules/FindMPI/libver_mpi.f90.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPI/mpiver.f90.in b/deps/cmake/share/cmake-3.25/Modules/FindMPI/mpiver.f90.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPI/mpiver.f90.in
rename to deps/cmake/share/cmake-3.25/Modules/FindMPI/mpiver.f90.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPI/test_mpi.c b/deps/cmake/share/cmake-3.25/Modules/FindMPI/test_mpi.c
similarity index 51%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPI/test_mpi.c
rename to deps/cmake/share/cmake-3.25/Modules/FindMPI/test_mpi.c
index 7c96d54a..36b5dfd4 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindMPI/test_mpi.c
+++ b/deps/cmake/share/cmake-3.25/Modules/FindMPI/test_mpi.c
@@ -7,15 +7,15 @@
 #endif
 
 #if defined(MPI_VERSION) && defined(MPI_SUBVERSION)
-const char mpiver_str[] = { 'I', 'N',
-                            'F', 'O',
-                            ':', 'M',
-                            'P', 'I',
-                            '-', 'V',
-                            'E', 'R',
-                            '[', ('0' + MPI_VERSION),
-                            '.', ('0' + MPI_SUBVERSION),
-                            ']', '\0' };
+static const char mpiver_str[] = { 'I', 'N',
+                                   'F', 'O',
+                                   ':', 'M',
+                                   'P', 'I',
+                                   '-', 'V',
+                                   'E', 'R',
+                                   '[', ('0' + MPI_VERSION),
+                                   '.', ('0' + MPI_SUBVERSION),
+                                   ']', '\0' };
 #endif
 
 int main(int argc, char* argv[])
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMPI/test_mpi.f90.in b/deps/cmake/share/cmake-3.25/Modules/FindMPI/test_mpi.f90.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMPI/test_mpi.f90.in
rename to deps/cmake/share/cmake-3.25/Modules/FindMPI/test_mpi.f90.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMatlab.cmake b/deps/cmake/share/cmake-3.25/Modules/FindMatlab.cmake
similarity index 88%
rename from deps/cmake/share/cmake-3.21/Modules/FindMatlab.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindMatlab.cmake
index c8df670b..07a9adf2 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindMatlab.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindMatlab.cmake
@@ -85,14 +85,49 @@ Module Input Variables
 Users or projects may set the following variables to configure the module
 behavior:
 
+:variable:`Matlab_ROOT <<PackageName>_ROOT>`
+  .. versionadded:: 3.25
+
+  Default value for :variable:`Matlab_ROOT_DIR`, the root of the Matlab
+  installation.
+
 :variable:`Matlab_ROOT_DIR`
-  the root of the Matlab installation.
+  The root of the Matlab installation.
+
 :variable:`MATLAB_FIND_DEBUG`
   outputs debug information
+
 :variable:`MATLAB_ADDITIONAL_VERSIONS`
   additional versions of Matlab for the automatic retrieval of the installed
   versions.
 
+Imported targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.22
+
+This module defines the following :prop_tgt:`IMPORTED` targets:
+
+``Matlab::mex``
+  The ``mex`` library, always available.
+
+``Matlab::mx``
+  The mx library of Matlab (arrays), always available.
+
+``Matlab::eng``
+  Matlab engine library. Available only if the ``ENG_LIBRARY`` component
+  is requested.
+
+``Matlab::mat``
+  Matlab matrix library. Available only if the ``MAT_LIBRARY`` component
+  is requested.
+
+``Matlab::MatlabEngine``
+  Matlab C++ engine library, always available for R2018a and newer.
+
+``Matlab::MatlabDataArray``
+  Matlab C++ data array library, always available for R2018a and newer.
+
 Variables defined by the module
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -261,6 +296,9 @@ if(NOT MATLAB_ADDITIONAL_VERSIONS)
 endif()
 
 set(MATLAB_VERSIONS_MAPPING
+  "R2022b=9.13"
+  "R2022a=9.12"
+  "R2021b=9.11"
   "R2021a=9.10"
   "R2020b=9.9"
   "R2020a=9.8"
@@ -450,7 +488,7 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
 
   if(matlabs_from_registry)
     list(REMOVE_DUPLICATES matlabs_from_registry)
-    list(SORT matlabs_from_registry)
+    list(SORT matlabs_from_registry COMPARE NATURAL)
     list(REVERSE matlabs_from_registry)
   endif()
 
@@ -494,7 +532,7 @@ macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
   # we order from more recent to older
   if(matlab_supported_versions)
     list(REMOVE_DUPLICATES matlab_supported_versions)
-    list(SORT matlab_supported_versions)
+    list(SORT matlab_supported_versions COMPARE NATURAL)
     list(REVERSE matlab_supported_versions)
   endif()
 
@@ -740,6 +778,10 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
     set(devnull INPUT_FILE NUL)
   endif()
 
+  # we first try to run a simple program using the -r option, and then we use the
+  # -batch option that is supported and recommended since R2019a
+  set(_matlab_get_version_failed_with_r_option FALSE)
+
   # timeout set to 120 seconds, in case it does not start
   # note as said before OUTPUT_VARIABLE cannot be used in a platform
   # independent manner however, not setting it would flush the output of Matlab
@@ -757,20 +799,65 @@ function(matlab_get_version_from_matlab_run matlab_binary_program matlab_list_ve
   if(_matlab_result_version_call MATCHES "timeout")
     if(MATLAB_FIND_DEBUG)
       message(WARNING "[MATLAB] Unable to determine the version of Matlab."
-        " Matlab call timed out after 120 seconds.")
+        " Matlab call with -r option timed out after 120 seconds.")
     endif()
-    return()
+    set(_matlab_get_version_failed_with_r_option TRUE)
   endif()
 
-  if(${_matlab_result_version_call})
+  if(NOT ${_matlab_get_version_failed_with_r_option} AND ${_matlab_result_version_call})
     if(MATLAB_FIND_DEBUG)
-      message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call returned with error ${_matlab_result_version_call}.")
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call with -r option returned with error ${_matlab_result_version_call}.")
     endif()
-    return()
-  elseif(NOT EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
+    set(_matlab_get_version_failed_with_r_option TRUE)
+  elseif(NOT ${_matlab_get_version_failed_with_r_option} AND NOT EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
     if(MATLAB_FIND_DEBUG)
       message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
     endif()
+    set(_matlab_get_version_failed_with_r_option TRUE)
+  endif()
+
+  if(_matlab_get_version_failed_with_r_option)
+    execute_process(
+      COMMAND "${matlab_binary_program}" -nosplash -nojvm ${_matlab_additional_commands} -logfile "matlabVersionLog.cmaketmp" -nodesktop -nodisplay -batch "version, exit"
+      OUTPUT_VARIABLE _matlab_version_from_cmd_dummy_batch
+      RESULT_VARIABLE _matlab_result_version_call_batch
+      ERROR_VARIABLE _matlab_result_version_call_error_batch
+      TIMEOUT 120
+      WORKING_DIRECTORY "${_matlab_temporary_folder}"
+      ${devnull}
+      )
+
+    if(_matlab_result_version_call_batch MATCHES "timeout")
+      if(MATLAB_FIND_DEBUG)
+        message(WARNING "[MATLAB] Unable to determine the version of Matlab."
+          " Matlab call with -batch option timed out after 120 seconds.")
+      endif()
+      return()
+    endif()
+
+    if(${_matlab_result_version_call_batch})
+      if(MATLAB_FIND_DEBUG)
+        message(WARNING "[MATLAB] Command executed \"${matlab_binary_program}\" -nosplash -nojvm ${_matlab_additional_commands} -logfile \"matlabVersionLog.cmaketmp\" -nodesktop -nodisplay -batch \"version, exit\"")
+        message(WARNING "_matlab_version_from_cmd_dummy_batch (OUTPUT_VARIABLE): ${_matlab_version_from_cmd_dummy_batch}")
+        message(WARNING "_matlab_result_version_call_batch (RESULT_VARIABLE): ${_matlab_result_version_call_batch}")
+        message(WARNING "_matlab_result_version_call_error_batch (ERROR_VARIABLE): ${_matlab_result_version_call_error_batch}")
+        message(WARNING "[MATLAB] Unable to determine the version of Matlab. Matlab call with -batch option returned with error ${_matlab_result_version_call_batch}.")
+      endif()
+      return()
+    elseif(NOT ${_matlab_get_version_failed_with_r_option} AND NOT EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
+      if(MATLAB_FIND_DEBUG)
+        message(WARNING "[MATLAB] Unable to determine the version of Matlab. The log file does not exist.")
+      endif()
+      return()
+    endif()
+  endif()
+
+  if(NOT EXISTS "${_matlab_temporary_folder}/matlabVersionLog.cmaketmp")
+    # last resort check as some HPC with "module load matlab" not enacted fail to catch in earlier checks
+    # and error CMake configure even if find_package(Matlab) is not REQUIRED
+    if(MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Unable to determine the version of Matlab. The version log file does not exist.")
+    endif()
     return()
   endif()
 
@@ -899,6 +986,16 @@ function(matlab_add_unit_test)
     message(FATAL_ERROR "[MATLAB] The Matlab test name cannot be empty")
   endif()
 
+  # The option to run a batch program with MATLAB changes depending on the MATLAB version
+  # For MATLAB before R2019a (9.6), the only supported option is -r, afterwords the suggested option
+  # is -batch as -r is deprecated
+  set(maut_BATCH_OPTION "-r")
+  if(NOT (Matlab_VERSION_STRING STREQUAL ""))
+    if(Matlab_VERSION_STRING VERSION_GREATER_EQUAL "9.6")
+      set(maut_BATCH_OPTION "-batch")
+    endif()
+  endif()
+
   add_test(NAME ${${prefix}_NAME}
            COMMAND ${CMAKE_COMMAND}
             "-Dtest_name=${${prefix}_NAME}"
@@ -912,6 +1009,7 @@ function(matlab_add_unit_test)
             "-Dunittest_file_to_run=${${prefix}_UNITTEST_FILE}"
             "-Dcustom_Matlab_test_command=${${prefix}_CUSTOM_TEST_COMMAND}"
             "-Dcmd_to_run_before_test=${${prefix}_UNITTEST_PRECOMMAND}"
+            "-Dmaut_BATCH_OPTION=${maut_BATCH_OPTION}"
             -P ${_FindMatlab_SELF_DIR}/MatlabTestsRedirect.cmake
            ${${prefix}_TEST_ARGS}
            ${${prefix}_UNPARSED_ARGUMENTS}
@@ -940,6 +1038,7 @@ endfunction()
          [LINK_TO target1 target2 ...]
          [R2017b | R2018a]
          [EXCLUDE_FROM_ALL]
+         [NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES]
          [...]
      )
 
@@ -949,7 +1048,8 @@ endfunction()
     list of source files.
   ``LINK_TO``
     a list of additional link dependencies.  The target links to ``libmex``
-    and ``libmx`` by default.
+    and ``libmx`` by default, unless the
+    ``NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES`` option is passed.
   ``OUTPUT_NAME``
     if given, overrides the default name. The default name is
     the name of the target without any prefix and
@@ -985,6 +1085,12 @@ endfunction()
     This option has the same meaning as for :prop_tgt:`EXCLUDE_FROM_ALL` and
     is forwarded to :command:`add_library` or :command:`add_executable`
     commands.
+  ``NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES``
+    .. versionadded:: 3.24
+
+    This option permits to disable the automatic linking of MATLAB
+    libraries, so that only the libraries that are actually required can be
+    linked via the ``LINK_TO`` option.
 
   The documentation file is not processed and should be in the following
   format:
@@ -1011,7 +1117,7 @@ function(matlab_add_mex)
 
   endif()
 
-  set(options EXECUTABLE MODULE SHARED R2017b R2018a EXCLUDE_FROM_ALL)
+  set(options EXECUTABLE MODULE SHARED R2017b R2018a EXCLUDE_FROM_ALL NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES)
   set(oneValueArgs NAME DOCUMENTATION OUTPUT_NAME)
   set(multiValueArgs LINK_TO SRC)
 
@@ -1083,16 +1189,19 @@ function(matlab_add_mex)
 
   target_include_directories(${${prefix}_NAME} PRIVATE ${Matlab_INCLUDE_DIRS})
 
-  if(Matlab_HAS_CPP_API)
-    if(Matlab_ENGINE_LIBRARY)
-      target_link_libraries(${${prefix}_NAME} ${Matlab_ENGINE_LIBRARY})
+  if(NOT ${prefix}_NO_IMPLICIT_LINK_TO_MATLAB_LIBRARIES)
+    if(Matlab_HAS_CPP_API)
+      if(Matlab_ENGINE_LIBRARY)
+        target_link_libraries(${${prefix}_NAME} ${Matlab_ENGINE_LIBRARY})
+      endif()
+      if(Matlab_DATAARRAY_LIBRARY)
+        target_link_libraries(${${prefix}_NAME} ${Matlab_DATAARRAY_LIBRARY})
+      endif()
     endif()
-    if(Matlab_DATAARRAY_LIBRARY)
-      target_link_libraries(${${prefix}_NAME} ${Matlab_DATAARRAY_LIBRARY})
-    endif()
-  endif()
 
-  target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY} ${${prefix}_LINK_TO})
+    target_link_libraries(${${prefix}_NAME} ${Matlab_MEX_LIBRARY} ${Matlab_MX_LIBRARY})
+  endif()
+  target_link_libraries(${${prefix}_NAME} ${${prefix}_LINK_TO})
   set_target_properties(${${prefix}_NAME}
       PROPERTIES
         PREFIX ""
@@ -1325,7 +1434,7 @@ function(_Matlab_get_version_from_root matlab_root matlab_or_mcr matlab_known_ve
              ${versioninfo_string}
             )
 
-      if(CMAKE_MATCH_1 MATCHES "(([0-9])\\.([0-9]))[\\.0-9]*")
+      if(CMAKE_MATCH_1 MATCHES "(([0-9]+)\\.([0-9]+))[\\.0-9]*")
         set(_matlab_version_tmp "${CMAKE_MATCH_1}")
       endif()
     endif()
@@ -1481,6 +1590,13 @@ endfunction()
 # this variable will get all Matlab installations found in the current system.
 set(_matlab_possible_roots)
 
+if(NOT DEFINED Matlab_ROOT AND DEFINED ENV{Matlab_ROOT})
+  set(Matlab_ROOT $ENV{Matlab_ROOT})
+endif()
+if(DEFINED Matlab_ROOT)
+  set(Matlab_ROOT_DIR ${Matlab_ROOT})
+endif()
+
 if(Matlab_ROOT_DIR)
   # if the user specifies a possible root, we keep this one
 
@@ -1544,6 +1660,30 @@ if(_numbers_of_matlab_roots GREATER 0)
     list(GET _matlab_possible_roots ${_matlab_or_mcr_index} Matlab_Or_MCR)
     list(GET _matlab_possible_roots ${_list_index} Matlab_VERSION_STRING)
     list(GET _matlab_possible_roots ${_matlab_root_dir_index} Matlab_ROOT_DIR)
+  elseif(DEFINED Matlab_FIND_VERSION)
+    set(_list_index -1)
+    foreach(_matlab_root_index RANGE 1 ${_numbers_of_matlab_roots} 3)
+      list(GET _matlab_possible_roots ${_matlab_root_index} _matlab_root_version)
+      if(_matlab_root_version VERSION_GREATER_EQUAL Matlab_FIND_VERSION)
+        set(_list_index ${_matlab_root_index})
+        break()
+      endif()
+    endforeach()
+
+    if(_list_index LESS 0)
+      set(_list_index 1)
+    endif()
+
+    math(EXPR _matlab_or_mcr_index "${_list_index} - 1")
+    math(EXPR _matlab_root_dir_index "${_list_index} + 1")
+    list(GET _matlab_possible_roots ${_matlab_or_mcr_index} Matlab_Or_MCR)
+    list(GET _matlab_possible_roots ${_list_index} Matlab_VERSION_STRING)
+    list(GET _matlab_possible_roots ${_matlab_root_dir_index} Matlab_ROOT_DIR)
+    # adding a warning in case of ambiguity
+    if(_numbers_of_matlab_roots GREATER 3 AND MATLAB_FIND_DEBUG)
+      message(WARNING "[MATLAB] Found several distributions of Matlab. Setting the current version to ${Matlab_VERSION_STRING} (located ${Matlab_ROOT_DIR})."
+                      " If this is not the desired behavior, use the EXACT keyword or provide the -DMatlab_ROOT_DIR=... on the command line")
+    endif()
   else()
     list(GET _matlab_possible_roots 0 Matlab_Or_MCR)
     list(GET _matlab_possible_roots 1 Matlab_VERSION_STRING)
@@ -1626,7 +1766,11 @@ endif()
 if(APPLE)
   set(_matlab_bin_prefix "mac") # i should be for intel
   set(_matlab_bin_suffix_32bits "i")
-  set(_matlab_bin_suffix_64bits "i64")
+  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+    set(_matlab_bin_suffix_64bits "a64")
+  else()
+    set(_matlab_bin_suffix_64bits "i64")
+  endif()
 elseif(UNIX)
   set(_matlab_bin_prefix "gln")
   set(_matlab_bin_suffix_32bits "x86")
@@ -1865,6 +2009,32 @@ if(Matlab_DATAARRAY_LIBRARY)
   list(APPEND Matlab_LIBRARIES ${Matlab_DATAARRAY_LIBRARY})
 endif()
 
+# internal
+# This small stub permits to add imported targets for the found MATLAB libraries
+function(_Matlab_add_imported_target _matlab_library_variable_name _matlab_library_target_name)
+  if(Matlab_${_matlab_library_variable_name}_LIBRARY)
+    if(NOT TARGET Matlab::${_matlab_library_target_name})
+      add_library(Matlab::${_matlab_library_target_name} UNKNOWN IMPORTED)
+      set_target_properties(Matlab::${_matlab_library_target_name} PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${Matlab_INCLUDE_DIRS}"
+        IMPORTED_LOCATION "${Matlab_${_matlab_library_variable_name}_LIBRARY}")
+      if(_matlab_library_target_name STREQUAL "mex" OR
+         _matlab_library_target_name STREQUAL "eng" OR
+         _matlab_library_target_name STREQUAL "mat")
+        set_target_properties(Matlab::${_matlab_library_target_name} PROPERTIES
+          INTERFACE_LINK_LIBRARIES Matlab::mx)
+      endif()
+    endif()
+  endif()
+endfunction()
+
+_Matlab_add_imported_target(MX mx)
+_Matlab_add_imported_target(MEX mex)
+_Matlab_add_imported_target(ENG eng)
+_Matlab_add_imported_target(MAT mat)
+_Matlab_add_imported_target(ENGINE MatlabEngine)
+_Matlab_add_imported_target(DATAARRAY MatlabDataArray)
+
 find_package_handle_standard_args(
   Matlab
   FOUND_VAR Matlab_FOUND
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMotif.cmake b/deps/cmake/share/cmake-3.25/Modules/FindMotif.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMotif.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindMotif.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindMsys.cmake b/deps/cmake/share/cmake-3.25/Modules/FindMsys.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindMsys.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindMsys.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindODBC.cmake b/deps/cmake/share/cmake-3.25/Modules/FindODBC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindODBC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindODBC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenACC.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenACC.cmake
similarity index 87%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenACC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenACC.cmake
index cf58f3b8..00e42b8e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindOpenACC.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindOpenACC.cmake
@@ -27,6 +27,13 @@ The module provides :prop_tgt:`IMPORTED` targets:
 Variables
 ^^^^^^^^^
 
+The module defines the following variables:
+
+``OpenACC_FOUND``
+  .. versionadded:: 3.25
+
+  Variable indicating that OpenACC flags for at least one languages have been found.
+
 This module will set the following variables per language in your
 project, where ``<lang>`` is one of C, CXX, or Fortran:
 
@@ -121,21 +128,18 @@ set(OpenACC_Fortran_CHECK_VERSION_SOURCE
 )
 
 
-function(_OPENACC_WRITE_SOURCE_FILE LANG SRC_FILE_CONTENT_VAR SRC_FILE_NAME SRC_FILE_FULLPATH)
-  set(WORK_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindOpenACC)
+macro(_OPENACC_PREPARE_SOURCE LANG CONTENT_ID NAME_PREFIX FULLNAME_VAR CONTENT_VAR)
   if("${LANG}" STREQUAL "C")
-    set(SRC_FILE "${WORK_DIR}/${SRC_FILE_NAME}.c")
-    file(WRITE "${SRC_FILE}" "${OpenACC_C_CXX_${SRC_FILE_CONTENT_VAR}}")
+    set(${FULLNAME_VAR} "${NAME_PREFIX}.c")
+    set(${CONTENT_VAR} "${OpenACC_C_CXX_${CONTENT_ID}}")
   elseif("${LANG}" STREQUAL "CXX")
-    set(SRC_FILE "${WORK_DIR}/${SRC_FILE_NAME}.cpp")
-    file(WRITE "${SRC_FILE}" "${OpenACC_C_CXX_${SRC_FILE_CONTENT_VAR}}")
+    set(${FULLNAME_VAR} "${NAME_PREFIX}.cpp")
+    set(${CONTENT_VAR} "${OpenACC_C_CXX_${CONTENT_ID}}")
   elseif("${LANG}" STREQUAL "Fortran")
-    set(SRC_FILE "${WORK_DIR}/${SRC_FILE_NAME}.F90")
-    file(WRITE "${SRC_FILE}_in" "${OpenACC_Fortran_${SRC_FILE_CONTENT_VAR}}")
-    configure_file("${SRC_FILE}_in" "${SRC_FILE}" @ONLY)
+    set(${FULLNAME_VAR} "${NAME_PREFIX}.F90")
+    set(${CONTENT_VAR} "${OpenACC_Fortran_${CONTENT_ID}}")
   endif()
-  set(${SRC_FILE_FULLPATH} "${SRC_FILE}" PARENT_SCOPE)
-endfunction()
+endmacro()
 
 
 function(_OPENACC_GET_FLAGS_CANDIDATE LANG FLAG_VAR)
@@ -177,10 +181,12 @@ endfunction()
 function(_OPENACC_GET_FLAGS LANG FLAG_VAR)
   set(FLAG_CANDIDATES "")
   _OPENACC_GET_FLAGS_CANDIDATE("${LANG}" FLAG_CANDIDATES)
-  _OPENACC_WRITE_SOURCE_FILE("${LANG}" "TEST_SOURCE" OpenACCTryFlag _OPENACC_TEST_SRC)
+  _OPENACC_PREPARE_SOURCE("${LANG}" TEST_SOURCE OpenACCTryFlag
+    _OPENACC_TEST_SRC_NAME _OPENACC_TEST_SRC_CONTENT)
 
   foreach(FLAG IN LISTS FLAG_CANDIDATES)
-    try_compile(OpenACC_FLAG_TEST_RESULT ${CMAKE_BINARY_DIR} ${_OPENACC_TEST_SRC}
+    try_compile(OpenACC_FLAG_TEST_RESULT
+      SOURCE_FROM_VAR "${_OPENACC_TEST_SRC_NAME}" _OPENACC_TEST_SRC_CONTENT
       CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${FLAG}"
       OUTPUT_VARIABLE OpenACC_TRY_COMPILE_OUTPUT
     )
@@ -205,13 +211,15 @@ endfunction()
 
 
 function(_OPENACC_GET_SPEC_DATE LANG SPEC_DATE)
-  _OPENACC_WRITE_SOURCE_FILE("${LANG}" "CHECK_VERSION_SOURCE" OpenACCCheckVersion _OPENACC_TEST_SRC)
+  _OPENACC_PREPARE_SOURCE(${LANG} CHECK_VERSION_SOURCE OpenACCCheckVersion
+    _OPENACC_TEST_SRC_NAME _OPENACC_TEST_SRC_CONTENT)
 
   set(BIN_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindOpenACC/accver_${LANG}.bin")
-  try_compile(OpenACC_SPECTEST_${LANG} "${CMAKE_BINARY_DIR}" "${_OPENACC_TEST_SRC}"
-              CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OpenACC_${LANG}_FLAGS}"
-              COPY_FILE ${BIN_FILE}
-              OUTPUT_VARIABLE OUTPUT)
+  try_compile(OpenACC_SPECTEST_${LANG}
+    SOURCE_FROM_VAR "${_OPENACC_TEST_SRC_NAME}" _OPENACC_TEST_SRC_CONTENT
+    CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OpenACC_${LANG}_FLAGS}"
+    COPY_FILE "${BIN_FILE}"
+    OUTPUT_VARIABLE OUTPUT)
 
   if(${OpenACC_SPECTEST_${LANG}})
     file(STRINGS ${BIN_FILE} specstr LIMIT_COUNT 1 REGEX "INFO:OpenACC-date")
@@ -270,6 +278,9 @@ foreach (LANG IN ITEMS C CXX Fortran)
       REQUIRED_VARS OpenACC_${LANG}_FLAGS
       VERSION_VAR OpenACC_${LANG}_VERSION
     )
+    if(OpenACC_${LANG}_FOUND)
+      set(OpenACC_FOUND TRUE)
+    endif()
   endif()
 endforeach()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenAL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenAL.cmake
similarity index 81%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenAL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenAL.cmake
index b5b92c56..53aafdc0 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindOpenAL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindOpenAL.cmake
@@ -29,6 +29,16 @@ OpenAL is searched in the following order:
 5. Manually compiled framework: ``/Library/Frameworks``.
 6. Add-on package: ``/opt``.
 
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.25
+
+This module defines the :prop_tgt:`IMPORTED` target:
+
+``OpenAL::OpenAL``
+  The OpenAL library, if found.
+
 Result Variables
 ^^^^^^^^^^^^^^^^
 
@@ -94,3 +104,19 @@ find_package_handle_standard_args(
   )
 
 mark_as_advanced(OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
+
+if(OPENAL_INCLUDE_DIR AND OPENAL_LIBRARY)
+  if(NOT TARGET OpenAL::OpenAL)
+    if(EXISTS "${OPENAL_LIBRARY}")
+      add_library(OpenAL::OpenAL UNKNOWN IMPORTED)
+      set_target_properties(OpenAL::OpenAL PROPERTIES
+        IMPORTED_LOCATION "${OPENAL_LIBRARY}")
+    else()
+      add_library(OpenAL::OpenAL INTERFACE IMPORTED)
+      set_target_properties(OpenAL::OpenAL PROPERTIES
+        IMPORTED_LIBNAME "${OPENAL_LIBRARY}")
+    endif()
+    set_target_properties(OpenAL::OpenAL PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${OPENAL_INCLUDE_DIR}")
+  endif()
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenCL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenCL.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenCL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenCL.cmake
index 1b4662b7..5c7aa22d 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindOpenCL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindOpenCL.cmake
@@ -45,7 +45,7 @@ function(_FIND_OPENCL_VERSION)
   set(CMAKE_REQUIRED_QUIET ${OpenCL_FIND_QUIETLY})
 
   CMAKE_PUSH_CHECK_STATE()
-  foreach(VERSION "2_2" "2_1" "2_0" "1_2" "1_1" "1_0")
+  foreach(VERSION "3_0" "2_2" "2_1" "2_0" "1_2" "1_1" "1_0")
     set(CMAKE_REQUIRED_INCLUDES "${OpenCL_INCLUDE_DIR}")
 
     if(APPLE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenGL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenGL.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenGL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenGL.cmake
index d6d1c000..a9a1b2ae 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindOpenGL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindOpenGL.cmake
@@ -377,7 +377,7 @@ else()
      (NOT OPENGL_USE_EGL AND
       NOT OPENGL_glx_LIBRARY AND
           OPENGL_gl_LIBRARY))
-    list(APPEND _OpenGL_REQUIRED_VARS OPENGL_gl_LIBRARY)
+    list(PREPEND _OpenGL_REQUIRED_VARS OPENGL_gl_LIBRARY)
   endif()
 
   # We always need the 'gl.h' include dir.
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenMP.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenMP.cmake
similarity index 85%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenMP.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenMP.cmake
index 929a8098..9e249257 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindOpenMP.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindOpenMP.cmake
@@ -102,6 +102,7 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
     unset(OpenMP_FLAG_CANDIDATES)
 
     set(OMP_FLAG_GNU "-fopenmp")
+    set(OMP_FLAG_LCC "-fopenmp")
     set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp" "-Xclang -fopenmp")
     set(OMP_FLAG_AppleClang "-Xclang -fopenmp")
     set(OMP_FLAG_HP "+Oopenmp")
@@ -177,27 +178,25 @@ set(OpenMP_Fortran_TEST_SOURCE
   "
 )
 
-function(_OPENMP_WRITE_SOURCE_FILE LANG SRC_FILE_CONTENT_VAR SRC_FILE_NAME SRC_FILE_FULLPATH)
-  set(WORK_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindOpenMP)
+macro(_OPENMP_PREPARE_SOURCE LANG CONTENT_ID NAME_PREFIX FULLNAME_VAR CONTENT_VAR)
   if("${LANG}" STREQUAL "C")
-    set(SRC_FILE "${WORK_DIR}/${SRC_FILE_NAME}.c")
-    file(WRITE "${SRC_FILE}" "${OpenMP_C_CXX_${SRC_FILE_CONTENT_VAR}}")
+    set(${FULLNAME_VAR} "${NAME_PREFIX}.c")
+    set(${CONTENT_VAR} "${OpenMP_C_CXX_${CONTENT_ID}}")
   elseif("${LANG}" STREQUAL "CXX")
-    set(SRC_FILE "${WORK_DIR}/${SRC_FILE_NAME}.cpp")
-    file(WRITE "${SRC_FILE}" "${OpenMP_C_CXX_${SRC_FILE_CONTENT_VAR}}")
+    set(${FULLNAME_VAR} "${NAME_PREFIX}.cpp")
+    set(${CONTENT_VAR} "${OpenMP_C_CXX_${CONTENT_ID}}")
   elseif("${LANG}" STREQUAL "Fortran")
-    set(SRC_FILE "${WORK_DIR}/${SRC_FILE_NAME}.f90")
-    file(WRITE "${SRC_FILE}_in" "${OpenMP_Fortran_${SRC_FILE_CONTENT_VAR}}")
-    configure_file("${SRC_FILE}_in" "${SRC_FILE}" @ONLY)
+    set(${FULLNAME_VAR} "${NAME_PREFIX}.F90")
+    string(CONFIGURE "${OpenMP_Fortran_${CONTENT_ID}}" ${CONTENT_VAR} @ONLY)
   endif()
-  set(${SRC_FILE_FULLPATH} "${SRC_FILE}" PARENT_SCOPE)
-endfunction()
+endmacro()
 
 include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseImplicitLinkInfo.cmake)
 
 function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
   _OPENMP_FLAG_CANDIDATES("${LANG}")
-  _OPENMP_WRITE_SOURCE_FILE("${LANG}" "TEST_SOURCE" OpenMPTryFlag _OPENMP_TEST_SRC)
+  _OPENMP_PREPARE_SOURCE("${LANG}" TEST_SOURCE OpenMPTryFlag
+    _OPENMP_TEST_SRC_NAME _OPENMP_TEST_SRC_CONTENT)
 
   unset(OpenMP_VERBOSE_COMPILE_OPTIONS)
   separate_arguments(OpenMP_VERBOSE_OPTIONS NATIVE_COMMAND "${CMAKE_${LANG}_VERBOSE_FLAG}")
@@ -213,7 +212,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
       string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}")
     endif()
     string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
-    try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
+    try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}
+      SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
       CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
       LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG}
       OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
@@ -237,11 +237,29 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
           OpenMP_${LANG}_IMPLICIT_FWK_DIRS
           OpenMP_${LANG}_LOG_VAR
           "${CMAKE_${LANG}_IMPLICIT_OBJECT_REGEX}"
+          LANGUAGE ${LANG}
         )
 
         file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
         "Parsed ${LANG} OpenMP implicit link information from above output:\n${OpenMP_${LANG}_LOG_VAR}\n\n")
 
+        # For LCC we should additionally alanyze -print-search-dirs output
+        # to check for additional implicit_dirs.
+        # Note: This won't work if CMP0129 policy is set to OLD!
+        if("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "LCC")
+          execute_process(
+            COMMAND ${CMAKE_${LANG}_COMPILER} -print-search-dirs
+            OUTPUT_VARIABLE output_lines
+            COMMAND_ERROR_IS_FATAL ANY
+            ERROR_QUIET)
+          if("${output_lines}" MATCHES ".*\nlibraries:[ \t]+(.*:)\n.*")
+            string(REPLACE ":" ";" implicit_dirs_addon "${CMAKE_MATCH_1}")
+            list(PREPEND OpenMP_${LANG}_IMPLICIT_LINK_DIRS ${implicit_dirs_addon})
+            file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+              "  Extended OpenMP library search paths: [${implicit_dirs}]\n")
+          endif()
+        endif()
+
         unset(_OPENMP_LIB_NAMES)
         foreach(_OPENMP_IMPLICIT_LIB IN LISTS OpenMP_${LANG}_IMPLICIT_LIBRARIES)
           get_filename_component(_OPENMP_IMPLICIT_LIB_DIR "${_OPENMP_IMPLICIT_LIB}" DIRECTORY)
@@ -261,7 +279,9 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
                 DOC "Path to the ${_OPENMP_IMPLICIT_LIB_PLAIN} library for OpenMP"
                 HINTS ${OpenMP_${LANG}_IMPLICIT_LINK_DIRS}
                 CMAKE_FIND_ROOT_PATH_BOTH
-                NO_DEFAULT_PATH
+                NO_PACKAGE_ROOT_PATH
+                NO_CMAKE_PATH
+                NO_CMAKE_ENVIRONMENT_PATH
               )
             endif()
             mark_as_advanced(OpenMP_${_OPENMP_IMPLICIT_LIB_PLAIN}_LIBRARY)
@@ -290,7 +310,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
         # Try without specifying include directory first. We only want to
         # explicitly add a search path if the header can't be found on the
         # default header search path already.
-        try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
+        try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}
+          SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
           CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
           LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} ${OpenMP_libomp_LIBRARY}
           OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
@@ -300,7 +321,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
           mark_as_advanced(OpenMP_${LANG}_INCLUDE_DIR)
           set(OpenMP_${LANG}_INCLUDE_DIR "${OpenMP_${LANG}_INCLUDE_DIR}" PARENT_SCOPE)
           if(OpenMP_${LANG}_INCLUDE_DIR)
-            try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
+            try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}
+              SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
               CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
                           "-DINCLUDE_DIRECTORIES:STRING=${OpenMP_${LANG}_INCLUDE_DIR}"
               LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} ${OpenMP_libomp_LIBRARY}
@@ -322,7 +344,8 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_VAR OPENMP_LIB_NAMES_VAR)
       )
       mark_as_advanced(OpenMP_libomp_LIBRARY)
       if(OpenMP_libomp_LIBRARY)
-        try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC}
+        try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}
+          SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
           CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST}"
           LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} ${OpenMP_libomp_LIBRARY}
           OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT
@@ -384,7 +407,8 @@ set(OpenMP_Fortran_CHECK_VERSION_SOURCE
 ")
 
 function(_OPENMP_GET_SPEC_DATE LANG SPEC_DATE)
-  _OPENMP_WRITE_SOURCE_FILE("${LANG}" "CHECK_VERSION_SOURCE" OpenMPCheckVersion _OPENMP_TEST_SRC)
+  _OPENMP_PREPARE_SOURCE("${LANG}" CHECK_VERSION_SOURCE OpenMPCheckVersion
+    _OPENMP_TEST_SRC_NAME _OPENMP_TEST_SRC_CONTENT)
 
   unset(_includeDirFlags)
   if(OpenMP_${LANG}_INCLUDE_DIR)
@@ -393,10 +417,11 @@ function(_OPENMP_GET_SPEC_DATE LANG SPEC_DATE)
 
   set(BIN_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindOpenMP/ompver_${LANG}.bin")
   string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}")
-  try_compile(OpenMP_SPECTEST_${LANG}_${OPENMP_PLAIN_FLAG} "${CMAKE_BINARY_DIR}" "${_OPENMP_TEST_SRC}"
-              CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OpenMP_${LANG}_FLAGS}" ${_includeDirFlags}
-              COPY_FILE ${BIN_FILE}
-              OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT)
+  try_compile(OpenMP_SPECTEST_${LANG}_${OPENMP_PLAIN_FLAG}
+    SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT
+    CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OpenMP_${LANG}_FLAGS}" ${_includeDirFlags}
+    COPY_FILE "${BIN_FILE}"
+    OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT)
 
   if(${OpenMP_SPECTEST_${LANG}_${OPENMP_PLAIN_FLAG}})
     file(STRINGS ${BIN_FILE} specstr LIMIT_COUNT 1 REGEX "INFO:OpenMP-date")
@@ -459,10 +484,14 @@ foreach(LANG IN ITEMS C CXX)
     if(NOT DEFINED OpenMP_${LANG}_FLAGS OR "${OpenMP_${LANG}_FLAGS}" STREQUAL "NOTFOUND"
       OR NOT DEFINED OpenMP_${LANG}_LIB_NAMES OR "${OpenMP_${LANG}_LIB_NAMES}" STREQUAL "NOTFOUND")
       _OPENMP_GET_FLAGS("${LANG}" "${LANG}" OpenMP_${LANG}_FLAGS_WORK OpenMP_${LANG}_LIB_NAMES_WORK)
-      set(OpenMP_${LANG}_FLAGS "${OpenMP_${LANG}_FLAGS_WORK}"
-        CACHE STRING "${LANG} compiler flags for OpenMP parallelization" FORCE)
-      set(OpenMP_${LANG}_LIB_NAMES "${OpenMP_${LANG}_LIB_NAMES_WORK}"
-        CACHE STRING "${LANG} compiler libraries for OpenMP parallelization" FORCE)
+      if(NOT DEFINED OpenMP_${LANG}_FLAGS OR "${OpenMP_${LANG}_FLAGS}" STREQUAL "NOTFOUND")
+        set(OpenMP_${LANG}_FLAGS "${OpenMP_${LANG}_FLAGS_WORK}"
+          CACHE STRING "${LANG} compiler flags for OpenMP parallelization" FORCE)
+      endif()
+      if(NOT DEFINED OpenMP_${LANG}_LIB_NAMES OR "${OpenMP_${LANG}_LIB_NAMES}" STREQUAL "NOTFOUND")
+        set(OpenMP_${LANG}_LIB_NAMES "${OpenMP_${LANG}_LIB_NAMES_WORK}"
+          CACHE STRING "${LANG} compiler libraries for OpenMP parallelization" FORCE)
+      endif()
       mark_as_advanced(OpenMP_${LANG}_FLAGS OpenMP_${LANG}_LIB_NAMES)
     endif()
   endif()
@@ -478,10 +507,14 @@ if(CMAKE_Fortran_COMPILER_LOADED)
       set(OpenMP_Fortran_HAVE_OMPLIB_MODULE TRUE CACHE BOOL INTERNAL "")
     endif()
 
-    set(OpenMP_Fortran_FLAGS "${OpenMP_Fortran_FLAGS_WORK}"
-      CACHE STRING "Fortran compiler flags for OpenMP parallelization")
-    set(OpenMP_Fortran_LIB_NAMES "${OpenMP_Fortran_LIB_NAMES_WORK}"
-      CACHE STRING "Fortran compiler libraries for OpenMP parallelization")
+    if(NOT DEFINED OpenMP_Fortran_FLAGS OR "${OpenMP_Fortran_FLAGS}" STREQUAL "NOTFOUND")
+      set(OpenMP_Fortran_FLAGS "${OpenMP_Fortran_FLAGS_WORK}"
+        CACHE STRING "Fortran compiler flags for OpenMP parallelization" FORCE)
+    endif()
+    if(NOT DEFINED OpenMP_Fortran_LIB_NAMES OR "${OpenMP_Fortran_LIB_NAMES}" STREQUAL "NOTFOUND")
+      set(OpenMP_Fortran_LIB_NAMES "${OpenMP_Fortran_LIB_NAMES_WORK}"
+        CACHE STRING "Fortran compiler libraries for OpenMP parallelization" FORCE)
+    endif()
     mark_as_advanced(OpenMP_Fortran_FLAGS OpenMP_Fortran_LIB_NAMES)
   endif()
 
@@ -494,11 +527,14 @@ if(CMAKE_Fortran_COMPILER_LOADED)
       set(OpenMP_Fortran_HAVE_OMPLIB_HEADER TRUE CACHE BOOL INTERNAL "")
     endif()
 
-    set(OpenMP_Fortran_FLAGS "${OpenMP_Fortran_FLAGS_WORK}"
-      CACHE STRING "Fortran compiler flags for OpenMP parallelization")
-
-    set(OpenMP_Fortran_LIB_NAMES "${OpenMP_Fortran_LIB_NAMES}"
-      CACHE STRING "Fortran compiler libraries for OpenMP parallelization")
+    if(NOT DEFINED OpenMP_Fortran_FLAGS OR "${OpenMP_Fortran_FLAGS}" STREQUAL "NOTFOUND")
+      set(OpenMP_Fortran_FLAGS "${OpenMP_Fortran_FLAGS_WORK}"
+        CACHE STRING "Fortran compiler flags for OpenMP parallelization" FORCE)
+    endif()
+    if(NOT DEFINED OpenMP_Fortran_LIB_NAMES OR "${OpenMP_Fortran_LIB_NAMES}" STREQUAL "NOTFOUND")
+      set(OpenMP_Fortran_LIB_NAMES "${OpenMP_Fortran_LIB_NAMES_WORK}"
+        CACHE STRING "Fortran compiler libraries for OpenMP parallelization" FORCE)
+    endif()
   endif()
 
   if(OpenMP_Fortran_HAVE_OMPLIB_MODULE)
@@ -570,7 +606,8 @@ foreach(LANG IN LISTS OpenMP_FINDLIST)
         separate_arguments(_OpenMP_${LANG}_OPTIONS NATIVE_COMMAND "${OpenMP_${LANG}_FLAGS}")
         set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
           INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:${LANG}>:${_OpenMP_${LANG}_OPTIONS}>")
-        if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu")
+        if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu"
+          OR ${CMAKE_${LANG}_COMPILER_ID} STREQUAL "IntelLLVM")
           set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY
             INTERFACE_LINK_OPTIONS "${OpenMP_${LANG}_FLAGS}")
         endif()
diff --git a/deps/cmake/share/cmake-3.25/Modules/FindOpenSP.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenSP.cmake
new file mode 100644
index 00000000..655dd657
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FindOpenSP.cmake
@@ -0,0 +1,155 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindOpenSP
+----------
+
+.. versionadded:: 3.25
+
+Try to find the OpenSP library.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables:
+
+``OpenSP_FOUND``
+  True if (the requested version of) ``OpenSP`` is available
+
+``OpenSP_VERSION``
+  The version of ``OpenSP``
+
+``OpenSP_VERSION_MAJOR``
+  The major version of ``OpenSP``
+
+``OpenSP_VERSION_MINOR``
+  The minor version of ``OpenSP``
+
+``OpenSP_VERSION_PATCH``
+  The patch version of ``OpenSP``
+
+``OpenSP_INCLUDE_DIRS``
+  The include dirs of ``OpenSP`` with its headers
+
+``OpenSP_LIBRARIES``
+  The OpenSP library for use with target_link_libraries().
+  This can be passed to target_link_libraries() instead of
+  the :prop_tgt:`IMPORTED` ``OpenSP::OpenSP`` target
+
+``OpenSP_MULTI_BYTE``
+  True if ``SP_MULTI_BYTE`` was found to be defined in OpenSP's ``config.h``
+  header file, which indicates that the ``OpenSP`` library was compiled with
+  support for multi-byte characters. The consuming target needs to define the
+  ``SP_MULTI_BYTE`` to match this value in order to avoid issues with character
+  decoding.
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines the :prop_tgt:`IMPORTED` target ``OpenSP::OpenSP``, if
+OpenSP has been found.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``OpenSP_INCLUDE_DIR``
+  the OpenSP include directory
+
+``OpenSP_LIBRARY``
+  the absolute path of the osp library
+
+#]=======================================================================]
+
+if (NOT OpenSP_INCLUDE_DIR AND NOT OpenSP_LIBRARY)
+  find_package(PkgConfig)
+  if (PkgConfig_FOUND)
+    pkg_check_modules(OpenSP IMPORTED_TARGET GLOBAL opensp)
+
+    if (OpenSP_FOUND)
+      add_library(OpenSP::OpenSP INTERFACE IMPORTED)
+      target_link_libraries(OpenSP::OpenSP INTERFACE PkgConfig::OpenSP)
+
+      set(OpenSP_INCLUDE_DIR ${OpenSP_INCLUDE_DIRS})
+      set(OpenSP_LIBRARY ${OpenSP_LIBRARIES})
+    endif ()
+  endif ()
+endif ()
+
+if (NOT OpenSP_INCLUDE_DIR)
+  find_path(OpenSP_INCLUDE_DIR
+    NAMES ParserEventGeneratorKit.h
+    PATH_SUFFIXES OpenSP opensp
+    DOC "The OpenSP include directory"
+    )
+endif ()
+
+if (NOT OpenSP_LIBRARY)
+  find_library(OpenSP_LIBRARY_RELEASE
+    NAMES osp libosp opensp libopensp sp133 libsp
+    )
+
+  find_library(OpenSP_LIBRARY_DEBUG
+    NAMES ospd libospd openspd libopenspd sp133d libspd
+    )
+
+  include(SelectLibraryConfigurations)
+  select_library_configurations(OpenSP)
+endif ()
+
+if (OpenSP_INCLUDE_DIR AND OpenSP_LIBRARY)
+  if (EXISTS "${OpenSP_INCLUDE_DIR}/config.h")
+    if (NOT OpenSP_VERSION)
+      file(STRINGS "${OpenSP_INCLUDE_DIR}/config.h" opensp_version_str REGEX "^#define[\t ]+SP_VERSION[\t ]+\".*\"")
+      string(REGEX REPLACE "^.*SP_VERSION[\t ]+\"([^\"]*)\".*$" "\\1" OpenSP_VERSION "${opensp_version_str}")
+      unset(opensp_version_str)
+    endif ()
+
+    if (OpenSP_VERSION MATCHES [=[([0-9]+)\.([0-9]+)\.([0-9]+)]=])
+      set(OpenSP_VERSION_MAJOR "${CMAKE_MATCH_1}")
+      set(OpenSP_VERSION_MINOR "${CMAKE_MATCH_2}")
+      set(OpenSP_VERSION_PATCH "${CMAKE_MATCH_3}")
+    endif ()
+
+    include(CheckCXXSymbolExists)
+    check_cxx_symbol_exists(SP_MULTI_BYTE "${OpenSP_INCLUDE_DIR}/config.h" OpenSP_MULTI_BYTE)
+  endif ()
+
+  if (NOT TARGET OpenSP::OpenSP)
+    set(OpenSP_INCLUDE_DIRS ${OpenSP_INCLUDE_DIR})
+
+    add_library(OpenSP::OpenSP UNKNOWN IMPORTED)
+    set_target_properties(OpenSP::OpenSP PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OpenSP_INCLUDE_DIRS}")
+
+    if (OpenSP_LIBRARY_RELEASE)
+      set_target_properties(OpenSP::OpenSP PROPERTIES IMPORTED_LOCATION_RELEASE "${OpenSP_LIBRARY_RELEASE}")
+      set_property(TARGET OpenSP::OpenSP APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+    endif ()
+
+    if (OpenSP_LIBRARY_DEBUG)
+      set_target_properties(OpenSP::OpenSP PROPERTIES IMPORTED_LOCATION_DEBUG "${OpenSP_LIBRARY_DEBUG}")
+      set_property(TARGET OpenSP::OpenSP APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+    endif ()
+
+    if (NOT OpenSP_LIBRARY_RELEASE AND NOT OpenSP_LIBRARY_DEBUG)
+      set_property(TARGET OpenSP::OpenSP APPEND PROPERTY IMPORTED_LOCATION "${OpenSP_LIBRARY}")
+    endif ()
+  endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OpenSP
+  FOUND_VAR OpenSP_FOUND
+  REQUIRED_VARS OpenSP_LIBRARY OpenSP_INCLUDE_DIR
+  VERSION_VAR OpenSP_VERSION
+  )
+
+mark_as_advanced(OpenSP_INCLUDE_DIR OpenSP_LIBRARY OpenSP_MULTI_BYTE)
+
+include(FeatureSummary)
+set_package_properties(OpenSP PROPERTIES
+  URL "http://openjade.sourceforge.net/doc/index.htm"
+  DESCRIPTION "An SGML System Conforming to International Standard ISO 8879"
+  )
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenSSL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenSSL.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenSSL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenSSL.cmake
index 8474e05c..f66ffcf6 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindOpenSSL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindOpenSSL.cmake
@@ -90,13 +90,25 @@ This module will set the following variables in your project:
 Hints
 ^^^^^
 
-Set ``OPENSSL_ROOT_DIR`` to the root directory of an OpenSSL installation.
+The following variables may be set to control search behavior:
 
-.. versionadded:: 3.4
-  Set ``OPENSSL_USE_STATIC_LIBS`` to ``TRUE`` to look for static libraries.
+``OPENSSL_ROOT_DIR``
+  Set to the root directory of an OpenSSL installation.
 
-.. versionadded:: 3.5
-  Set ``OPENSSL_MSVC_STATIC_RT`` set ``TRUE`` to choose the MT version of the lib.
+``OPENSSL_USE_STATIC_LIBS``
+  .. versionadded:: 3.4
+
+  Set to ``TRUE`` to look for static libraries.
+
+``OPENSSL_MSVC_STATIC_RT``
+  .. versionadded:: 3.5
+
+  Set to ``TRUE`` to choose the MT version of the lib.
+
+``ENV{PKG_CONFIG_PATH}``
+  On UNIX-like systems, ``pkg-config`` is used to locate the system OpenSSL.
+  Set the ``PKG_CONFIG_PATH`` environment varialbe to look in alternate
+  locations.  Useful on multi-lib systems.
 #]=======================================================================]
 
 macro(_OpenSSL_test_and_find_dependencies ssl_library crypto_library)
@@ -124,7 +136,11 @@ function(_OpenSSL_target_add_dependencies target)
     set_property( TARGET ${target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS} )
   endif()
   if(WIN32 AND OPENSSL_USE_STATIC_LIBS)
-    set_property( TARGET ${target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ws2_32 )
+    if(WINCE)
+      set_property( TARGET ${target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ws2 )
+    else()
+      set_property( TARGET ${target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ws2_32 )
+    endif()
     set_property( TARGET ${target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES crypt32 )
   endif()
 endfunction()
@@ -144,6 +160,19 @@ if(OPENSSL_USE_STATIC_LIBS)
   endif()
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "QNX" AND
+  CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL "7.0" AND CMAKE_SYSTEM_VERSION VERSION_LESS "7.1" AND
+  OpenSSL_FIND_VERSION VERSION_GREATER_EQUAL "1.1" AND OpenSSL_FIND_VERSION VERSION_LESS "1.2")
+  # QNX 7.0.x provides openssl 1.0.2 and 1.1.1 in parallel:
+  # * openssl 1.0.2: libcrypto.so.2 and libssl.so.2, headers under usr/include/openssl
+  # * openssl 1.1.1: libcrypto1_1.so.2.1 and libssl1_1.so.2.1, header under usr/include/openssl1_1
+  # See http://www.qnx.com/developers/articles/rel_6726_0.html
+  set(_OPENSSL_FIND_PATH_SUFFIX "openssl1_1")
+  set(_OPENSSL_NAME_POSTFIX "1_1")
+else()
+  set(_OPENSSL_FIND_PATH_SUFFIX "include")
+endif()
+
 if (WIN32)
   # http://www.slproweb.com/products/Win32OpenSSL.html
   set(_OPENSSL_ROOT_HINTS
@@ -196,7 +225,7 @@ find_path(OPENSSL_INCLUDE_DIR
     ${_OPENSSL_INCLUDEDIR}
     ${_OPENSSL_INCLUDE_DIRS}
   PATH_SUFFIXES
-    include
+    ${_OPENSSL_FIND_PATH_SUFFIX}
 )
 
 if(WIN32 AND NOT CYGWIN)
@@ -375,6 +404,7 @@ if(WIN32 AND NOT CYGWIN)
       PATH_SUFFIXES
         "lib/MinGW"
         "lib"
+        "lib64"
     )
 
     find_library(SSL_EAY
@@ -385,6 +415,7 @@ if(WIN32 AND NOT CYGWIN)
       PATH_SUFFIXES
         "lib/MinGW"
         "lib"
+        "lib64"
     )
 
     mark_as_advanced(SSL_EAY LIB_EAY)
@@ -426,7 +457,7 @@ else()
 
   find_library(OPENSSL_SSL_LIBRARY
     NAMES
-      ssl
+      ssl${_OPENSSL_NAME_POSTFIX}
       ssleay32
       ssleay32MD
     NAMES_PER_DIR
@@ -435,19 +466,19 @@ else()
       ${_OPENSSL_LIBDIR}
       ${_OPENSSL_LIBRARY_DIRS}
     PATH_SUFFIXES
-      lib
+      lib lib64
   )
 
   find_library(OPENSSL_CRYPTO_LIBRARY
     NAMES
-      crypto
+      crypto${_OPENSSL_NAME_POSTFIX}
     NAMES_PER_DIR
     ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
       ${_OPENSSL_LIBRARY_DIRS}
     PATH_SUFFIXES
-      lib
+      lib lib64
   )
 
   mark_as_advanced(OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY)
@@ -538,6 +569,14 @@ if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
 
     set(OPENSSL_VERSION "${OPENSSL_VERSION_STR}")
 
+    # Setting OPENSSL_VERSION_MAJOR OPENSSL_VERSION_MINOR and OPENSSL_VERSION_FIX
+    string(REGEX MATCHALL "([0-9])+" OPENSSL_VERSION_NUMBER "${OPENSSL_VERSION}")
+    list(POP_FRONT OPENSSL_VERSION_NUMBER
+      OPENSSL_VERSION_MAJOR
+      OPENSSL_VERSION_MINOR
+      OPENSSL_VERSION_FIX)
+
+    unset(OPENSSL_VERSION_NUMBER)
     unset(OPENSSL_VERSION_STR)
   endif ()
 endif ()
@@ -650,7 +689,7 @@ if(OPENSSL_FOUND)
     _OpenSSL_target_add_dependencies(OpenSSL::SSL)
   endif()
 
-  if("${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_FIX}" VERSION_GREATER_EQUAL "0.9.8")
+  if("${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}" VERSION_GREATER_EQUAL "0.9.8")
     if(MSVC)
       if(EXISTS "${OPENSSL_INCLUDE_DIR}")
         set(_OPENSSL_applink_paths PATHS ${OPENSSL_INCLUDE_DIR})
@@ -677,3 +716,6 @@ endif()
 if(OPENSSL_USE_STATIC_LIBS)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
 endif()
+
+unset(_OPENSSL_FIND_PATH_SUFFIX)
+unset(_OPENSSL_NAME_POSTFIX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenSceneGraph.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenSceneGraph.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenSceneGraph.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenSceneGraph.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindOpenThreads.cmake b/deps/cmake/share/cmake-3.25/Modules/FindOpenThreads.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindOpenThreads.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindOpenThreads.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPHP4.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPHP4.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindPHP4.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPHP4.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPNG.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPNG.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindPNG.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPNG.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPackageHandleStandardArgs.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPackageHandleStandardArgs.cmake
index fbcf7cd8..56ba1e67 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPackageHandleStandardArgs.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPackageHandleStandardArgs.cmake
@@ -535,18 +535,24 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   set(VERSION_MSG "")
   set(VERSION_OK TRUE)
 
-  # check with DEFINED here as the requested or found version may be "0"
+  # check that the version variable is not empty to avoid emitting a misleading
+  # message (i.e. `Found unsuitable version ""`)
   if (DEFINED ${_NAME}_FIND_VERSION)
     if(DEFINED ${FPHSA_VERSION_VAR})
-      set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
-      if (FPHSA_HANDLE_VERSION_RANGE)
-        set (FPCV_HANDLE_VERSION_RANGE HANDLE_VERSION_RANGE)
+      if(NOT "${${FPHSA_VERSION_VAR}}" STREQUAL "")
+        set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
+        if (FPHSA_HANDLE_VERSION_RANGE)
+          set (FPCV_HANDLE_VERSION_RANGE HANDLE_VERSION_RANGE)
+        else()
+          set(FPCV_HANDLE_VERSION_RANGE NO_AUTHOR_WARNING_VERSION_RANGE)
+        endif()
+        find_package_check_version ("${_FOUND_VERSION}" VERSION_OK RESULT_MESSAGE_VARIABLE VERSION_MSG
+          ${FPCV_HANDLE_VERSION_RANGE})
       else()
-        set(FPCV_HANDLE_VERSION_RANGE NO_AUTHOR_WARNING_VERSION_RANGE)
+        set(VERSION_OK FALSE)
       endif()
-      find_package_check_version ("${_FOUND_VERSION}" VERSION_OK RESULT_MESSAGE_VARIABLE VERSION_MSG
-        ${FPCV_HANDLE_VERSION_RANGE})
-    else()
+    endif()
+    if("${${FPHSA_VERSION_VAR}}" STREQUAL "")
       # if the package was not found, but a version was given, add that to the output:
       if(${_NAME}_FIND_VERSION_EXACT)
         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPackageMessage.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPackageMessage.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindPackageMessage.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPackageMessage.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPatch.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPatch.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindPatch.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPatch.cmake
index 41086517..f4fe4a61 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPatch.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPatch.cmake
@@ -43,7 +43,7 @@ endif()
 
 # First search the PATH
 find_program(Patch_EXECUTABLE
-  NAME patch
+  NAMES patch
   PATHS ${_patch_path}
   DOC ${_doc}
   )
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPerl.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPerl.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindPerl.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPerl.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPerlLibs.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPerlLibs.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindPerlLibs.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPerlLibs.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPhysFS.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPhysFS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindPhysFS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPhysFS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPike.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPike.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindPike.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPike.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPkgConfig.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPkgConfig.cmake
similarity index 89%
rename from deps/cmake/share/cmake-3.21/Modules/FindPkgConfig.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPkgConfig.cmake
index 3bc9dba1..02f7fb41 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPkgConfig.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPkgConfig.cmake
@@ -12,11 +12,24 @@ Finds the ``pkg-config`` executable and adds the :command:`pkg_get_variable`,
 following variables will also be set:
 
 ``PKG_CONFIG_FOUND``
-  if pkg-config executable was found
-``PKG_CONFIG_EXECUTABLE``
-  pathname of the pkg-config program
+  True if a pkg-config executable was found.
+
 ``PKG_CONFIG_VERSION_STRING``
-  version of pkg-config (since CMake 2.8.8)
+  .. versionadded:: 2.8.8
+
+  The version of pkg-config that was found.
+
+``PKG_CONFIG_EXECUTABLE``
+  The pathname of the pkg-config program.
+
+``PKG_CONFIG_ARGN``
+  .. versionadded:: 3.22
+
+  A list of arguments to pass to pkg-config.
+
+Both ``PKG_CONFIG_EXECUTABLE`` and ``PKG_CONFIG_ARGN`` are initialized by the
+module, but may be overridden by the user.  See `Variables Affecting Behavior`_
+for how these variables are initialized.
 
 #]========================================]
 
@@ -29,13 +42,22 @@ set(PKG_CONFIG_VERSION 1)
 
 # find pkg-config, use PKG_CONFIG if set
 if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL ""))
-  set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable")
+  separate_arguments(PKG_CONFIG_FROM_ENV_SPLIT NATIVE_COMMAND PROGRAM SEPARATE_ARGS "$ENV{PKG_CONFIG}")
+  list(LENGTH PKG_CONFIG_FROM_ENV_SPLIT PKG_CONFIG_FROM_ENV_SPLIT_ARGC)
+  if(PKG_CONFIG_FROM_ENV_SPLIT_ARGC GREATER 0)
+    list(GET PKG_CONFIG_FROM_ENV_SPLIT 0 PKG_CONFIG_FROM_ENV_ARGV0)
+    if(PKG_CONFIG_FROM_ENV_SPLIT_ARGC GREATER 1)
+      list(SUBLIST PKG_CONFIG_FROM_ENV_SPLIT 1 -1 PKG_CONFIG_ARGN)
+    endif()
+    set(PKG_CONFIG_EXECUTABLE "${PKG_CONFIG_FROM_ENV_ARGV0}" CACHE FILEPATH "pkg-config executable")
+  endif()
 endif()
 
 set(PKG_CONFIG_NAMES "pkg-config")
 if(CMAKE_HOST_WIN32)
   list(PREPEND PKG_CONFIG_NAMES "pkg-config.bat")
 endif()
+list(APPEND PKG_CONFIG_NAMES "pkgconf")
 
 find_program(PKG_CONFIG_EXECUTABLE
   NAMES ${PKG_CONFIG_NAMES}
@@ -43,9 +65,12 @@ find_program(PKG_CONFIG_EXECUTABLE
   DOC "pkg-config executable")
 mark_as_advanced(PKG_CONFIG_EXECUTABLE)
 
+set(PKG_CONFIG_ARGN "${PKG_CONFIG_ARGN}" CACHE STRING "Arguments to supply to pkg-config")
+mark_as_advanced(PKG_CONFIG_ARGN)
+
 set(_PKG_CONFIG_FAILURE_MESSAGE "")
 if (PKG_CONFIG_EXECUTABLE)
-  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --version
+  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} ${PKG_CONFIG_ARGN} --version
     OUTPUT_VARIABLE PKG_CONFIG_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE
     ERROR_VARIABLE _PKG_CONFIG_VERSION_ERROR ERROR_STRIP_TRAILING_WHITESPACE
     RESULT_VARIABLE _PKG_CONFIG_VERSION_RESULT
@@ -53,14 +78,18 @@ if (PKG_CONFIG_EXECUTABLE)
 
   if (NOT _PKG_CONFIG_VERSION_RESULT EQUAL 0)
     string(REPLACE "\n" "\n    " _PKG_CONFIG_VERSION_ERROR "      ${_PKG_CONFIG_VERSION_ERROR}")
+    if(PKG_CONFIG_ARGN)
+      string(REPLACE ";" " " PKG_CONFIG_ARGN " ${PKG_CONFIG_ARGN}")
+    endif()
     string(APPEND _PKG_CONFIG_FAILURE_MESSAGE
       "The command\n"
-      "      \"${PKG_CONFIG_EXECUTABLE}\" --version\n"
+      "      \"${PKG_CONFIG_EXECUTABLE}\"${PKG_CONFIG_ARGN} --version\n"
       "    failed with output:\n${PKG_CONFIG_VERSION_STRING}\n"
       "    stderr: \n${_PKG_CONFIG_VERSION_ERROR}\n"
       "    result: \n${_PKG_CONFIG_VERSION_RESULT}"
       )
     set(PKG_CONFIG_EXECUTABLE "")
+    set(PKG_CONFIG_ARGN "")
     unset(PKG_CONFIG_VERSION_STRING)
   endif ()
   unset(_PKG_CONFIG_VERSION_RESULT)
@@ -79,10 +108,18 @@ set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
 
 # Unsets the given variables
 macro(_pkgconfig_unset var)
+  # Clear normal variable (possibly set by project code).
+  unset(${var})
+  # Store as cache variable.
+  # FIXME: Add a policy to switch to a normal variable.
   set(${var} "" CACHE INTERNAL "")
 endmacro()
 
 macro(_pkgconfig_set var value)
+  # Clear normal variable (possibly set by project code).
+  unset(${var})
+  # Store as cache variable.
+  # FIXME: Add a policy to switch to a normal variable.
   set(${var} ${value} CACHE INTERNAL "")
 endmacro()
 
@@ -91,7 +128,7 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
   set(_pkgconfig_invoke_result)
 
   execute_process(
-    COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
+    COMMAND ${PKG_CONFIG_EXECUTABLE} ${PKG_CONFIG_ARGN} ${ARGN} ${_pkglist}
     OUTPUT_VARIABLE _pkgconfig_invoke_result
     RESULT_VARIABLE _pkgconfig_failed
     OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -106,7 +143,9 @@ macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
       string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
     endif()
 
-    separate_arguments(_pkgconfig_invoke_result)
+    # pkg-config can represent "spaces within an argument" by backslash-escaping the space.
+    # UNIX_COMMAND mode treats backslash-escaped spaces as "not a space that delimits arguments".
+    separate_arguments(_pkgconfig_invoke_result UNIX_COMMAND "${_pkgconfig_invoke_result}")
 
     #message(STATUS "  ${_varname} ... ${_pkgconfig_invoke_result}")
     set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
@@ -385,6 +424,14 @@ macro(_pkg_set_path_internal)
     unset(_lib_dirs)
     unset(_pkgconfig_path)
   endif()
+
+  # Tell pkg-config not to strip any -L paths so we can search them all.
+  if(DEFINED ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS})
+    set(_pkgconfig_allow_system_libs_old "$ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}")
+  else()
+    unset(_pkgconfig_allow_system_libs_old)
+  endif()
+  set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} 1)
 endmacro()
 
 macro(_pkg_restore_path_internal)
@@ -392,6 +439,12 @@ macro(_pkg_restore_path_internal)
     # Restore the environment variable
     set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
   endif()
+  if(DEFINED _pkgconfig_allow_system_libs_old)
+    set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} "${_pkgconfig_allow_system_libs_old}")
+    unset(_pkgconfig_allow_system_libs_old)
+  else()
+    unset(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS})
+  endif()
 
   unset(_extra_paths)
   unset(_pkgconfig_path_old)
@@ -533,7 +586,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
 
       # execute the query
       execute_process(
-        COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
+        COMMAND ${PKG_CONFIG_EXECUTABLE} ${PKG_CONFIG_ARGN} ${_pkg_check_modules_exist_query}
         RESULT_VARIABLE _pkgconfig_retval
         ERROR_VARIABLE _pkgconfig_error
         ERROR_STRIP_TRAILING_WHITESPACE)
@@ -885,12 +938,30 @@ Variables Affecting Behavior
 
 .. variable:: PKG_CONFIG_EXECUTABLE
 
-  This can be set to the path of the pkg-config executable.  If not provided,
-  it will be set by the module as a result of calling :command:`find_program`
-  internally.
+  This cache variable can be set to the path of the pkg-config executable.
+  :command:`find_program` is called internally by the module with this
+  variable.
 
   .. versionadded:: 3.1
-    The ``PKG_CONFIG`` environment variable can be used as a hint.
+    The ``PKG_CONFIG`` environment variable can be used as a hint if
+    ``PKG_CONFIG_EXECUTABLE`` has not yet been set.
+
+  .. versionchanged:: 3.22
+    If the ``PKG_CONFIG`` environment variable is set, only the first
+    argument is taken from it when using it as a hint.
+
+.. variable:: PKG_CONFIG_ARGN
+
+  .. versionadded:: 3.22
+
+  This cache variable can be set to a list of arguments to additionally pass
+  to pkg-config if needed. If not provided, it will be initialized from the
+  ``PKG_CONFIG`` environment variable, if set. The first argument in that
+  environment variable is assumed to be the pkg-config program, while all
+  remaining arguments after that are used to initialize ``PKG_CONFIG_ARGN``.
+  If no such environment variable is defined, ``PKG_CONFIG_ARGN`` is
+  initialized to an empty string. The module does not update the variable once
+  it has been set in the cache.
 
 .. variable:: PKG_CONFIG_USE_CMAKE_PREFIX_PATH
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPostgreSQL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPostgreSQL.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/FindPostgreSQL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPostgreSQL.cmake
index 147071a0..c92fbdcd 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPostgreSQL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPostgreSQL.cmake
@@ -53,7 +53,7 @@ is set regardless of the presence of the ``Server`` component in find_package ca
 # In Windows the default installation of PostgreSQL uses that as part of the path.
 # E.g C:\Program Files\PostgreSQL\8.4.
 # Currently, the following version numbers are known to this module:
-# "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
+# "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
 #
 # To use this variable just do something like this:
 # set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4")
@@ -102,7 +102,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
 
 
 set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
-    "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+    "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
 
 # Define additional search paths for root directories.
 set( PostgreSQL_ROOT_DIRECTORIES
@@ -121,13 +121,16 @@ foreach(suffix ${PostgreSQL_KNOWN_VERSIONS})
   if(UNIX)
     list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES
         "postgresql${suffix}"
+        "postgresql@${suffix}"
         "pgsql-${suffix}/lib")
     list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES
         "postgresql${suffix}"
+        "postgresql@${suffix}"
         "postgresql/${suffix}"
         "pgsql-${suffix}/include")
     list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES
         "postgresql${suffix}/server"
+        "postgresql@${suffix}/server"
         "postgresql/${suffix}/server"
         "pgsql-${suffix}/include/server")
   endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindProducer.cmake b/deps/cmake/share/cmake-3.25/Modules/FindProducer.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindProducer.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindProducer.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindProtobuf.cmake b/deps/cmake/share/cmake-3.25/Modules/FindProtobuf.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindProtobuf.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindProtobuf.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPython.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPython.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindPython.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPython.cmake
index a4b7a038..04f9d8c2 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPython.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPython.cmake
@@ -229,11 +229,16 @@ Hints
   * If set to TRUE, search **only** for static libraries.
   * If set to FALSE, search **only** for shared libraries.
 
+  .. note::
+
+    This hint will be ignored on ``Windows`` because static libraries are not
+    available on this platform.
+
 ``Python_FIND_ABI``
   .. versionadded:: 3.16
 
-  This variable defines which ABIs, as defined in
-  `PEP 3149 <https://www.python.org/dev/peps/pep-3149/>`_, should be searched.
+  This variable defines which ABIs, as defined in :pep:`3149`, should be
+  searched.
 
   .. note::
 
@@ -358,7 +363,7 @@ Hints
     ``Anaconda`` or ``ActivePython``, rely on this implementation.
   * ``IronPython``: This implementation use the ``CSharp`` language for
     ``.NET Framework`` on top of the `Dynamic Language Runtime` (``DLR``).
-    See `IronPython <http://ironpython.net>`_.
+    See `IronPython <https://ironpython.net>`_.
   * ``PyPy``: This implementation use ``RPython`` language and
     ``RPython translation toolchain`` to produce the python interpreter.
     See `PyPy <https://www.pypy.org>`_.
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPython/Support.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPython/Support.cmake
similarity index 90%
rename from deps/cmake/share/cmake-3.21/Modules/FindPython/Support.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPython/Support.cmake
index 8e70e111..7a127e4b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPython/Support.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPython/Support.cmake
@@ -14,6 +14,8 @@ cmake_policy(PUSH)
 cmake_policy (SET CMP0012 NEW)
 # IN_LIST operator
 cmake_policy (SET CMP0057 NEW)
+# registry view behavior
+cmake_policy (SET CMP0134 NEW)
 
 if (NOT DEFINED _PYTHON_PREFIX)
   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
@@ -22,7 +24,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
   message (FATAL_ERROR "FindPython: INTERNAL ERROR")
 endif()
 if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
-  set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+  set(_${_PYTHON_PREFIX}_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2")
   set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
 else()
@@ -98,6 +100,7 @@ macro (_PYTHON_FIND_FRAMEWORKS)
                          ${_pff_CMAKE_FRAMEWORK_PATH}
                          ~/Library/Frameworks
                          /usr/local/Frameworks
+                         /opt/homebrew/Frameworks
                          ${CMAKE_SYSTEM_FRAMEWORK_PATH})
     list (REMOVE_DUPLICATES _pff_frameworks)
     foreach (_pff_implementation IN LISTS _${_PYTHON_PREFIX}_FIND_IMPLEMENTATIONS)
@@ -174,30 +177,31 @@ function (_PYTHON_GET_REGISTRIES _PYTHON_PGR_REGISTRY_PATHS)
       foreach (version IN LISTS _PGR_VERSION)
         string (REPLACE "." "" version_no_dots ${version})
         list (APPEND registries
-                     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${version}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${version}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath])
+                     [HKEY_CURRENT_USER/SOFTWARE/Python/PythonCore/${version}-${_${_PYTHON_PREFIX}_ARCH}/InstallPath]
+                     [HKEY_CURRENT_USER/SOFTWARE/Python/PythonCore/${version}-${_${_PYTHON_PREFIX}_ARCH2}/InstallPath])
         if (version VERSION_GREATER_EQUAL "3.5")
+          # cmake_host_system_information is not usable in bootstrap
           get_filename_component (arch "[HKEY_CURRENT_USER\\Software\\Python\\PythonCore\\${version};SysArchitecture]" NAME)
           if (arch MATCHES "(${_${_PYTHON_PREFIX}_ARCH}|${_${_PYTHON_PREFIX}_ARCH2})bit")
             list (APPEND registries
-                         [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${version}\\InstallPath])
+                         [HKEY_CURRENT_USER/SOFTWARE/Python/PythonCore/${version}/InstallPath])
           endif()
         else()
           list (APPEND registries
-                       [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${version}\\InstallPath])
+                       [HKEY_CURRENT_USER/SOFTWARE/Python/PythonCore/${version}/InstallPath])
         endif()
         list (APPEND registries
-                     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath]
-                     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${version}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${version}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath]
-                     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${version}\\InstallPath]
-                     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH}\\InstallPath]
-                     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\ContinuumAnalytics\\Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH2}\\InstallPath])
+                     [HKEY_CURRENT_USER/SOFTWARE/Python/ContinuumAnalytics/Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH}/InstallPath]
+                     [HKEY_CURRENT_USER/SOFTWARE/Python/ContinuumAnalytics/Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH2}/InstallPath]
+                     [HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${version}-${_${_PYTHON_PREFIX}_ARCH}/InstallPath]
+                     [HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${version}-${_${_PYTHON_PREFIX}_ARCH2}/InstallPath]
+                     [HKEY_LOCAL_MACHINE/SOFTWARE/Python/PythonCore/${version}/InstallPath]
+                     [HKEY_LOCAL_MACHINE/SOFTWARE/Python/ContinuumAnalytics/Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH}/InstallPath]
+                     [HKEY_LOCAL_MACHINE/SOFTWARE/Python/ContinuumAnalytics/Anaconda${version_no_dots}-${_${_PYTHON_PREFIX}_ARCH2}/InstallPath])
       endforeach()
     elseif (implementation STREQUAL "IronPython")
       foreach (version  IN LISTS _PGR_VERSION)
-        list (APPEND registries [HKEY_LOCAL_MACHINE\\SOFTWARE\\IronPython\\${version}\\InstallPath])
+        list (APPEND registries [HKEY_LOCAL_MACHINE/SOFTWARE/IronPython/${version}/InstallPath])
       endforeach()
     endif()
   endforeach()
@@ -279,26 +283,26 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
             if (CMAKE_LIBRARY_ARCHITECTURE)
               set (suffixes "${abi}")
               if (suffixes)
-                list (TRANSFORM suffixes PREPEND "lib/python${_PGPS_VERSION}/config-${_PGPS_VERSION}")
+                list (TRANSFORM suffixes PREPEND "lib/python${version}/config-${version}")
                 list (TRANSFORM suffixes APPEND "-${CMAKE_LIBRARY_ARCHITECTURE}")
               else()
-                set (suffixes "lib/python${_PGPS_VERSION}/config-${_PGPS_VERSION}-${CMAKE_LIBRARY_ARCHITECTURE}")
+                set (suffixes "lib/python${version}/config-${version}-${CMAKE_LIBRARY_ARCHITECTURE}")
               endif()
               list (APPEND path_suffixes ${suffixes})
             endif()
             set (suffixes "${abi}")
             if (suffixes)
-              list (TRANSFORM suffixes PREPEND "lib/python${_PGPS_VERSION}/config-${_PGPS_VERSION}")
+              list (TRANSFORM suffixes PREPEND "lib/python${version}/config-${version}")
             else()
-              set (suffixes "lib/python${_PGPS_VERSION}/config-${_PGPS_VERSION}")
+              set (suffixes "lib/python${version}/config-${version}")
             endif()
             list (APPEND path_suffixes ${suffixes})
           elseif (_PGPS_INCLUDE)
             set (suffixes "${abi}")
             if (suffixes)
-              list (TRANSFORM suffixes PREPEND "include/python${_PGPS_VERSION}")
+              list (TRANSFORM suffixes PREPEND "include/python${version}")
             else()
-              set (suffixes "include/python${_PGPS_VERSION}")
+              set (suffixes "include/python${version}")
             endif()
             list (APPEND path_suffixes ${suffixes} include)
           endif()
@@ -317,6 +321,9 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES)
       elseif (_PGPS_LIBRARY)
         list (APPEND path_suffixes ${_${_PYTHON_PREFIX}_PYPY_LIBRARY_PATH_SUFFIXES})
       elseif (_PGPS_INCLUDE)
+        foreach (version IN LISTS _PGPS_VERSION)
+          list (APPEND path_suffixes lib/pypy${version}/include pypy${version}/include)
+        endforeach()
         list (APPEND path_suffixes ${_${_PYTHON_PREFIX}_PYPY_INCLUDE_PATH_SUFFIXES})
       endif()
     endif()
@@ -411,7 +418,6 @@ function (_PYTHON_GET_NAMES _PYTHON_PGN_NAMES)
         if (_PGN_WIN32)
           foreach (version IN LISTS _PGN_VERSION)
             string (REPLACE "." "" version_no_dots ${version})
-
             set (name "python${version_no_dots}")
             if (_PGN_DEBUG)
               string (APPEND name "_d")
@@ -419,6 +425,13 @@ function (_PYTHON_GET_NAMES _PYTHON_PGN_NAMES)
             list (APPEND names "${name}")
           endforeach()
         endif()
+
+        if (_PGN_POSIX)
+          foreach(version IN LISTS _PGN_VERSION)
+            list (APPEND names "pypy${version}-c")
+          endforeach()
+        endif()
+
         list (APPEND names ${_${_PYTHON_PREFIX}_PYPY_LIB_NAMES})
       endif()
     endif()
@@ -584,9 +597,20 @@ function (_PYTHON_GET_VERSION)
         set (${_PGV_PREFIX}VERSION_MINOR "${CMAKE_MATCH_2}" PARENT_SCOPE)
         set (${_PGV_PREFIX}VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" PARENT_SCOPE)
         set (${_PGV_PREFIX}ABI "${CMAKE_MATCH_3}" PARENT_SCOPE)
+      elseif (library_name MATCHES "pypy([23])\\.([0-9]+)-c")
+        set (${_PGV_PREFIX}VERSION_MAJOR "${CMAKE_MATCH_1}" PARENT_SCOPE)
+        set (${_PGV_PREFIX}VERSION_MINOR "${CMAKE_MATCH_2}" PARENT_SCOPE)
+        set (${_PGV_PREFIX}VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" PARENT_SCOPE)
+        set (${_PGV_PREFIX}ABI "" PARENT_SCOPE)
       elseif (library_name MATCHES "pypy(3)?-c")
         set (version "${CMAKE_MATCH_1}")
-        if (version EQUAL "3")
+        # try to pick-up a more precise version from the path
+        get_filename_component (library_dir "${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}" DIRECTORY)
+        if (library_dir MATCHES "/pypy([23])\\.([0-9]+)/")
+          set (${_PGV_PREFIX}VERSION_MAJOR "${CMAKE_MATCH_1}" PARENT_SCOPE)
+          set (${_PGV_PREFIX}VERSION_MINOR "${CMAKE_MATCH_2}" PARENT_SCOPE)
+          set (${_PGV_PREFIX}VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" PARENT_SCOPE)
+        elseif (version EQUAL "3")
           set (${_PGV_PREFIX}VERSION_MAJOR "3" PARENT_SCOPE)
           set (${_PGV_PREFIX}VERSION "3" PARENT_SCOPE)
         else()
@@ -653,7 +677,7 @@ endfunction()
 function (_PYTHON_GET_LAUNCHER _PYTHON_PGL_NAME)
   cmake_parse_arguments (PARSE_ARGV 1 _PGL "INTERPRETER;COMPILER" "" "")
 
-  unset ({_PYTHON_PGL_NAME} PARENT_SCOPE)
+  unset (${_PYTHON_PGL_NAME} PARENT_SCOPE)
 
   if ((_PGL_INTERPRETER AND NOT _${_PYTHON_PREFIX}_EXECUTABLE)
       OR (_PGL_COMPILER AND NOT _${_PYTHON_PREFIX}_COMPILER))
@@ -690,7 +714,7 @@ function (_PYTHON_VALIDATE_INTERPRETER)
 
   if (_PVI_CHECK_EXISTS AND NOT EXISTS "${_${_PYTHON_PREFIX}_EXECUTABLE}")
     # interpreter does not exist anymore
-    set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Cannot find the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+    set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Cannot find the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
     return()
   endif()
@@ -711,7 +735,7 @@ function (_PYTHON_VALIDATE_INTERPRETER)
     endif()
     if (NOT abi IN_LIST _${_PYTHON_PREFIX}_ABIFLAGS)
       # incompatible ABI
-      set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Wrong ABI for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+      set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Wrong ABI for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
       set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
       return()
     endif()
@@ -727,7 +751,7 @@ function (_PYTHON_VALIDATE_INTERPRETER)
                      OUTPUT_STRIP_TRAILING_WHITESPACE)
     if (result)
       # interpreter is not usable
-      set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Cannot use the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+      set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Cannot use the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
       set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
       return()
     endif()
@@ -752,7 +776,7 @@ function (_PYTHON_VALIDATE_INTERPRETER)
 
       if (_PVI_EXACT AND NOT version VERSION_EQUAL _PVI_VERSION)
         # interpreter has wrong version
-        set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Wrong version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Wrong version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
         set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
         return()
       else()
@@ -761,7 +785,7 @@ function (_PYTHON_VALIDATE_INTERPRETER)
         string(REGEX REPLACE "^([0-9]+)\\.?.*$" "\\1" expected_major_version "${_PVI_VERSION}")
         if (NOT major_version VERSION_EQUAL expected_major_version
             OR NOT version VERSION_GREATER_EQUAL _PVI_VERSION)
-          set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Wrong version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Wrong version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
           set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
           return()
         endif()
@@ -773,7 +797,7 @@ function (_PYTHON_VALIDATE_INTERPRETER)
       find_package_check_version ("${version}" in_range HANDLE_VERSION_RANGE)
       if (NOT in_range)
         # interpreter has invalid version
-        set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Wrong version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Wrong version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
         set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
         return()
       endif()
@@ -792,9 +816,9 @@ function (_PYTHON_VALIDATE_INTERPRETER)
       if (result OR NOT version EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
         # interpreter not usable or has wrong major version
         if (result)
-          set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Cannot use the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Cannot use the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
         else()
-          set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Wrong major version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Wrong major version for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
         endif()
         set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
         return()
@@ -815,9 +839,9 @@ function (_PYTHON_VALIDATE_INTERPRETER)
     if (result OR NOT size EQUAL CMAKE_SIZEOF_VOID_P)
       # interpreter not usable or has wrong architecture
       if (result)
-        set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Cannot use the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Cannot use the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
       else()
-        set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Wrong architecture for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Wrong architecture for the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
       endif()
       set_property (CACHE _${_PYTHON_PREFIX}_EXECUTABLE PROPERTY VALUE "${_PYTHON_PREFIX}_EXECUTABLE-NOTFOUND")
       return()
@@ -825,6 +849,14 @@ function (_PYTHON_VALIDATE_INTERPRETER)
   endif()
 endfunction()
 
+function(_python_validate_find_interpreter status interpreter)
+  set(_${_PYTHON_PREFIX}_EXECUTABLE "${interpreter}" CACHE FILEPATH "" FORCE)
+  _python_validate_interpreter (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+  if (NOT _${_PYTHON_PREFIX}_EXECUTABLE)
+    set (${status} FALSE PARENT_SCOPE)
+  endif()
+endfunction()
+
 
 function (_PYTHON_VALIDATE_COMPILER)
   if (NOT _${_PYTHON_PREFIX}_COMPILER)
@@ -835,7 +867,7 @@ function (_PYTHON_VALIDATE_COMPILER)
 
   if (_PVC_CHECK_EXISTS AND NOT EXISTS "${_${_PYTHON_PREFIX}_COMPILER}")
     # Compiler does not exist anymore
-    set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE "Cannot find the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"" PARENT_SCOPE)
+    set_property (CACHE _${_PYTHON_PREFIX}_Compiler_REASON_FAILURE PROPERTY VALUE "Cannot find the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_COMPILER PROPERTY VALUE "${_PYTHON_PREFIX}_COMPILER-NOTFOUND")
     return()
   endif()
@@ -862,7 +894,7 @@ function (_PYTHON_VALIDATE_COMPILER)
   file (REMOVE_RECURSE "${working_dir}")
   if (result)
     # compiler is not usable
-    set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE "Cannot use the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"" PARENT_SCOPE)
+    set_property (CACHE _${_PYTHON_PREFIX}_Compiler_REASON_FAILURE PROPERTY VALUE "Cannot use the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_COMPILER PROPERTY VALUE "${_PYTHON_PREFIX}_COMPILER-NOTFOUND")
     return()
   endif()
@@ -888,7 +920,7 @@ function (_PYTHON_VALIDATE_COMPILER)
 
       if (_PVC_EXACT AND NOT version VERSION_EQUAL _PVC_VERSION)
         # interpreter has wrong version
-        set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE "Wrong version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Compiler_REASON_FAILURE PROPERTY VALUE "Wrong version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
         set_property (CACHE _${_PYTHON_PREFIX}_COMPILER PROPERTY VALUE "${_PYTHON_PREFIX}_COMPILER-NOTFOUND")
         return()
       else()
@@ -897,7 +929,7 @@ function (_PYTHON_VALIDATE_COMPILER)
         string(REGEX REPLACE "^([0-9]+)\\.?.*$" "\\1" expected_major_version "${_PVC_VERSION}")
         if (NOT major_version VERSION_EQUAL expected_major_version
             OR NOT version VERSION_GREATER_EQUAL _PVC_VERSION)
-          set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE "Wrong version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Compiler_REASON_FAILURE PROPERTY VALUE "Wrong version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
           set_property (CACHE _${_PYTHON_PREFIX}_COMPILER PROPERTY VALUE "${_PYTHON_PREFIX}_COMPILER-NOTFOUND")
           return()
         endif()
@@ -909,7 +941,7 @@ function (_PYTHON_VALIDATE_COMPILER)
       find_package_check_version ("${version}" in_range HANDLE_VERSION_RANGE)
       if (NOT in_range)
         # interpreter has invalid version
-        set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE "Wrong version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Compiler_REASON_FAILURE PROPERTY VALUE "Wrong version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
         set_property (CACHE _${_PYTHON_PREFIX}_COMPILER PROPERTY VALUE "${_PYTHON_PREFIX}_COMPILER-NOTFOUND")
         return()
       endif()
@@ -918,13 +950,21 @@ function (_PYTHON_VALIDATE_COMPILER)
     string(REGEX REPLACE "^([0-9]+)\\.?.*$" "\\1" major_version "${version}")
     if (NOT major_version EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
       # Compiler has wrong major version
-      set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE "Wrong major version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"" PARENT_SCOPE)
+      set_property (CACHE _${_PYTHON_PREFIX}_Compiler_REASON_FAILURE PROPERTY VALUE "Wrong major version for the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
       set_property (CACHE _${_PYTHON_PREFIX}_COMPILER PROPERTY VALUE "${_PYTHON_PREFIX}_COMPILER-NOTFOUND")
       return()
     endif()
   endif()
 endfunction()
 
+function(_python_validate_find_compiler status compiler)
+  set(_${_PYTHON_PREFIX}_COMPILER "${compiler}" CACHE FILEPATH "" FORCE)
+  _python_validate_compiler (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+  if (NOT _${_PYTHON_PREFIX}_COMPILER)
+    set (${status} FALSE PARENT_SCOPE)
+  endif()
+endfunction()
+
 
 function (_PYTHON_VALIDATE_LIBRARY)
   if (NOT _${_PYTHON_PREFIX}_LIBRARY_RELEASE)
@@ -936,7 +976,7 @@ function (_PYTHON_VALIDATE_LIBRARY)
 
   if (_PVL_CHECK_EXISTS AND NOT EXISTS "${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}")
     # library does not exist anymore
-    set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Cannot find the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"" PARENT_SCOPE)
+    set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Cannot find the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_LIBRARY_RELEASE PROPERTY VALUE "${_PYTHON_PREFIX}_LIBRARY_RELEASE-NOTFOUND")
     if (WIN32)
       set_property (CACHE _${_PYTHON_PREFIX}_LIBRARY_DEBUG PROPERTY VALUE "${_PYTHON_PREFIX}_LIBRARY_DEBUG-NOTFOUND")
@@ -950,7 +990,7 @@ function (_PYTHON_VALIDATE_LIBRARY)
 
   if (DEFINED _${_PYTHON_PREFIX}_FIND_ABI AND NOT lib_ABI IN_LIST _${_PYTHON_PREFIX}_ABIFLAGS)
     # incompatible ABI
-    set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong ABI for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"" PARENT_SCOPE)
+    set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong ABI for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_LIBRARY_RELEASE PROPERTY VALUE "${_PYTHON_PREFIX}_LIBRARY_RELEASE-NOTFOUND")
   else()
     if (_PVL_VERSION OR _PVL_IN_RANGE)
@@ -959,7 +999,7 @@ function (_PYTHON_VALIDATE_LIBRARY)
         string (REGEX MATCH "[0-9](\\.[0-9]+)?" version "${_PVL_VERSION}")
         if ((_PVL_EXACT AND NOT lib_VERSION VERSION_EQUAL version) OR (lib_VERSION VERSION_LESS version))
           # library has wrong version
-          set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong version for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong version for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
           set_property (CACHE _${_PYTHON_PREFIX}_LIBRARY_RELEASE PROPERTY VALUE "${_PYTHON_PREFIX}_LIBRARY_RELEASE-NOTFOUND")
         endif()
       endif()
@@ -969,14 +1009,14 @@ function (_PYTHON_VALIDATE_LIBRARY)
         find_package_check_version ("${lib_VERSION}" in_range HANDLE_VERSION_RANGE)
         if (NOT in_range)
           # library has wrong version
-          set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong version for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong version for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
           set_property (CACHE _${_PYTHON_PREFIX}_LIBRARY_RELEASE PROPERTY VALUE "${_PYTHON_PREFIX}_LIBRARY_RELEASE-NOTFOUND")
         endif()
       endif()
     else()
       if (NOT lib_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
         # library has wrong major version
-        set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong major version for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong major version for the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
         set_property (CACHE _${_PYTHON_PREFIX}_LIBRARY_RELEASE PROPERTY VALUE "${_PYTHON_PREFIX}_LIBRARY_RELEASE-NOTFOUND")
       endif()
     endif()
@@ -1002,7 +1042,7 @@ function (_PYTHON_VALIDATE_INCLUDE_DIR)
 
   if (_PVID_CHECK_EXISTS AND NOT EXISTS "${_${_PYTHON_PREFIX}_INCLUDE_DIR}")
     # include file does not exist anymore
-    set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Cannot find the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"" PARENT_SCOPE)
+    set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Cannot find the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_INCLUDE_DIR PROPERTY VALUE "${_PYTHON_PREFIX}_INCLUDE_DIR-NOTFOUND")
     return()
   endif()
@@ -1012,14 +1052,14 @@ function (_PYTHON_VALIDATE_INCLUDE_DIR)
 
   if (DEFINED _${_PYTHON_PREFIX}_FIND_ABI AND NOT inc_ABI IN_LIST _${_PYTHON_PREFIX}_ABIFLAGS)
     # incompatible ABI
-    set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong ABI for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"" PARENT_SCOPE)
+    set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong ABI for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_INCLUDE_DIR PROPERTY VALUE "${_PYTHON_PREFIX}_INCLUDE_DIR-NOTFOUND")
   else()
     if (_PVID_VERSION OR _PVID_IN_RANGE)
       if (_PVID_VERSION)
         if ((_PVID_EXACT AND NOT inc_VERSION VERSION_EQUAL expected_version) OR (inc_VERSION VERSION_LESS expected_version))
           # include dir has wrong version
-          set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong version for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong version for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"")
           set_property (CACHE _${_PYTHON_PREFIX}_INCLUDE_DIR PROPERTY VALUE "${_PYTHON_PREFIX}_INCLUDE_DIR-NOTFOUND")
         endif()
       endif()
@@ -1029,14 +1069,14 @@ function (_PYTHON_VALIDATE_INCLUDE_DIR)
         find_package_check_version ("${inc_VERSION}" in_range HANDLE_VERSION_RANGE)
         if (NOT in_range)
           # include dir has wrong version
-          set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong version for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"" PARENT_SCOPE)
+          set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong version for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"")
           set_property (CACHE _${_PYTHON_PREFIX}_INCLUDE_DIR PROPERTY VALUE "${_PYTHON_PREFIX}_INCLUDE_DIR-NOTFOUND")
         endif()
       endif()
     else()
       if (NOT inc_VERSION_MAJOR VERSION_EQUAL _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
         # include dir has wrong major version
-        set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Wrong major version for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"" PARENT_SCOPE)
+        set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Wrong major version for the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"")
         set_property (CACHE _${_PYTHON_PREFIX}_INCLUDE_DIR PROPERTY VALUE "${_PYTHON_PREFIX}_INCLUDE_DIR-NOTFOUND")
       endif()
     endif()
@@ -1226,10 +1266,21 @@ if (DEFINED ${_PYTHON_PREFIX}_FIND_STRATEGY)
 endif()
 
 # Python and Anaconda distributions: define which architectures can be used
+unset (_${_PYTHON_PREFIX}_REGISTRY_VIEW)
 if (CMAKE_SIZEOF_VOID_P)
-  # In this case, search only for 64bit or 32bit
   math (EXPR _${_PYTHON_PREFIX}_ARCH "${CMAKE_SIZEOF_VOID_P} * 8")
-  set (_${_PYTHON_PREFIX}_ARCH2 ${_${_PYTHON_PREFIX}_ARCH})
+  if ("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+      OR "Development.Embed" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
+    # In this case, search only for 64bit or 32bit
+    set (_${_PYTHON_PREFIX}_ARCH2 ${_${_PYTHON_PREFIX}_ARCH})
+    set (_${_PYTHON_PREFIX}_REGISTRY_VIEW REGISTRY_VIEW ${_${_PYTHON_PREFIX}_ARCH})
+  else()
+    if (_${_PYTHON_PREFIX}_ARCH EQUAL "32")
+      set (_${_PYTHON_PREFIX}_ARCH2 64)
+    else()
+      set (_${_PYTHON_PREFIX}_ARCH2 32)
+    endif()
+  endif()
 else()
   # architecture unknown, search for both 64bit and 32bit
   set (_${_PYTHON_PREFIX}_ARCH 64)
@@ -1264,7 +1315,7 @@ if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
     # special name for runtime part
     list (APPEND _${_PYTHON_PREFIX}_PYPY_LIB_NAMES libpypy3-c)
   endif()
-  set (_${_PYTHON_PREFIX}_PYPY_INCLUDE_PATH_SUFFIXES lib/pypy3)
+  set (_${_PYTHON_PREFIX}_PYPY_INCLUDE_PATH_SUFFIXES lib/pypy3/include pypy3/include)
 else()
   set (_${_PYTHON_PREFIX}_PYPY_NAMES pypy)
   set (_${_PYTHON_PREFIX}_PYPY_LIB_NAMES pypy-c)
@@ -1272,8 +1323,9 @@ else()
     # special name for runtime part
     list (APPEND _${_PYTHON_PREFIX}_PYPY_LIB_NAMES libpypy-c)
   endif()
-  set (_${_PYTHON_PREFIX}_PYPY_INCLUDE_PATH_SUFFIXES lib/pypy)
+  set (_${_PYTHON_PREFIX}_PYPY_INCLUDE_PATH_SUFFIXES lib/pypy/include pypy/include)
 endif()
+list (APPEND _${_PYTHON_PREFIX}_PYPY_INCLUDE_PATH_SUFFIXES libexec/include)
 set (_${_PYTHON_PREFIX}_PYPY_EXECUTABLE_PATH_SUFFIXES bin)
 set (_${_PYTHON_PREFIX}_PYPY_LIBRARY_PATH_SUFFIXES lib libs bin)
 list (APPEND _${_PYTHON_PREFIX}_PYPY_INCLUDE_PATH_SUFFIXES include)
@@ -1302,7 +1354,7 @@ foreach (_${_PYTHON_PREFIX}_IMPLEMENTATION IN LISTS _${_PYTHON_PREFIX}_FIND_IMPL
   if (_${_PYTHON_PREFIX}_IMPLEMENTATION STREQUAL "CPython")
     list (APPEND _${_PYTHON_PREFIX}_INCLUDE_NAMES "Python.h")
   elseif (_${_PYTHON_PREFIX}_IMPLEMENTATION STREQUAL "PyPy")
-    list (APPEND _${_PYTHON_PREFIX}_INCLUDE_NAMES "PyPy.h")
+    list (APPEND _${_PYTHON_PREFIX}_INCLUDE_NAMES "PyPy.h" "pypy_decl.h")
   endif()
 endforeach()
 
@@ -1475,9 +1527,13 @@ endfunction()
 unset (_${_PYTHON_PREFIX}_REQUIRED_VARS)
 unset (_${_PYTHON_PREFIX}_CACHED_VARS)
 unset (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE)
+set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE CACHE INTERNAL "Interpreter reason failure")
 unset (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE)
+set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE CACHE INTERNAL "Compiler reason failure")
 unset (_${_PYTHON_PREFIX}_Development_REASON_FAILURE)
+set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE CACHE INTERNAL "Development reason failure")
 unset (_${_PYTHON_PREFIX}_NumPy_REASON_FAILURE)
+set (_${_PYTHON_PREFIX}_NumPy_REASON_FAILURE CACHE INTERNAL "NumPy reason failure")
 
 
 # preamble
@@ -1559,9 +1615,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NO_CMAKE_PATH
                         NO_CMAKE_ENVIRONMENT_PATH
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-
-          _python_validate_interpreter (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_interpreter)
           if (_${_PYTHON_PREFIX}_EXECUTABLE)
             break()
           endif()
@@ -1581,8 +1636,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NO_CMAKE_PATH
                         NO_CMAKE_ENVIRONMENT_PATH
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-          _python_validate_interpreter (${${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_interpreter)
           if (_${_PYTHON_PREFIX}_EXECUTABLE)
             break()
           endif()
@@ -1595,9 +1650,10 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         HINTS ${_${_PYTHON_PREFIX}_HINTS}
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-          _python_validate_interpreter (${${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_interpreter)
           if (_${_PYTHON_PREFIX}_EXECUTABLE)
             break()
           endif()
@@ -1610,8 +1666,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                       HINTS ${_${_PYTHON_PREFIX}_HINTS}
                       PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
                       NO_SYSTEM_ENVIRONMENT_PATH
-                      NO_CMAKE_SYSTEM_PATH)
-        _python_validate_interpreter (${${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                      NO_CMAKE_SYSTEM_PATH
+                      VALIDATOR _python_validate_find_interpreter)
         if (_${_PYTHON_PREFIX}_EXECUTABLE)
           break()
         endif()
@@ -1619,8 +1675,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
         find_program (_${_PYTHON_PREFIX}_EXECUTABLE
                       NAMES ${_${_PYTHON_PREFIX}_NAMES}
                       NAMES_PER_DIR
-                      PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES})
-        _python_validate_interpreter (${${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                      PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                      VALIDATOR _python_validate_find_interpreter)
         if (_${_PYTHON_PREFIX}_EXECUTABLE)
           break()
         endif()
@@ -1632,8 +1688,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
-          _python_validate_interpreter (${${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_interpreter)
           if (_${_PYTHON_PREFIX}_EXECUTABLE)
             break()
           endif()
@@ -1645,8 +1701,9 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
-          _python_validate_interpreter (${${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_interpreter)
           if (_${_PYTHON_PREFIX}_EXECUTABLE)
             break()
           endif()
@@ -1656,9 +1713,9 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
       endwhile()
     else()
       # look-up for various versions and locations
-      set (_${_PYTHON_PREFIX}_VALIDATE_OPTIONS EXACT)
+      set (_${_PYTHON_PREFIX}_COMMON_VALIDATE_OPTIONS EXACT)
       if (${_PYTHON_PREFIX}_FIND_VERSION_RANGE)
-        list (APPEND _${_PYTHON_PREFIX}_VALIDATE_OPTIONS IN_RANGE)
+        list (APPEND _${_PYTHON_PREFIX}_COMMON_VALIDATE_OPTIONS IN_RANGE)
       endif()
 
       foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
@@ -1667,6 +1724,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
 
         _python_get_frameworks (_${_PYTHON_PREFIX}_FRAMEWORK_PATHS VERSION ${_${_PYTHON_PREFIX}_VERSION})
         _python_get_registries (_${_PYTHON_PREFIX}_REGISTRY_PATHS VERSION ${_${_PYTHON_PREFIX}_VERSION})
+        set (_${_PYTHON_PREFIX}_VALIDATE_OPTIONS VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_COMMON_VALIDATE_OPTIONS})
 
         # Virtual environments handling
         if (_${_PYTHON_PREFIX}_FIND_VIRTUALENV MATCHES "^(FIRST|ONLY)$")
@@ -1679,8 +1737,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NO_CMAKE_PATH
                         NO_CMAKE_ENVIRONMENT_PATH
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-          _python_validate_interpreter (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_interpreter)
           if (_${_PYTHON_PREFIX}_EXECUTABLE)
             break()
           endif()
@@ -1700,7 +1758,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NO_CMAKE_PATH
                         NO_CMAKE_ENVIRONMENT_PATH
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_interpreter)
         endif()
 
         # Windows registry
@@ -1711,11 +1770,12 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         HINTS ${_${_PYTHON_PREFIX}_HINTS}
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_interpreter)
         endif()
 
-        _python_validate_interpreter (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
         if (_${_PYTHON_PREFIX}_EXECUTABLE)
           break()
         endif()
@@ -1727,21 +1787,18 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                       HINTS ${_${_PYTHON_PREFIX}_HINTS}
                       PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
                       NO_SYSTEM_ENVIRONMENT_PATH
-                      NO_CMAKE_SYSTEM_PATH)
-        _python_validate_interpreter (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                      NO_CMAKE_SYSTEM_PATH
+                      VALIDATOR _python_validate_find_interpreter)
         if (_${_PYTHON_PREFIX}_EXECUTABLE)
           break()
         endif()
+
         # try using standard paths.
-        # NAMES_PER_DIR is not defined on purpose to have a chance to find
-        # expected version.
-        # For example, typical systems have 'python' for version 2.* and 'python3'
-        # for version 3.*. So looking for names per dir will find, potentially,
-        # systematically 'python' (i.e. version 2) even if version 3 is searched.
         find_program (_${_PYTHON_PREFIX}_EXECUTABLE
                       NAMES ${_${_PYTHON_PREFIX}_NAMES}
-                      PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES})
-        _python_validate_interpreter (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                      NAMES_PER_DIR
+                      PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                      VALIDATOR _python_validate_find_interpreter)
         if (_${_PYTHON_PREFIX}_EXECUTABLE)
           break()
         endif()
@@ -1753,7 +1810,8 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_interpreter)
         endif()
 
         # Windows registry
@@ -1763,10 +1821,11 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_interpreter)
         endif()
 
-        _python_validate_interpreter (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
         if (_${_PYTHON_PREFIX}_EXECUTABLE)
           break()
         endif()
@@ -1775,15 +1834,12 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
       if (NOT _${_PYTHON_PREFIX}_EXECUTABLE AND
           NOT _${_PYTHON_PREFIX}_FIND_VIRTUALENV STREQUAL "ONLY")
         # No specific version found. Retry with generic names and standard paths.
-        # NAMES_PER_DIR is not defined on purpose to have a chance to find
-        # expected version.
-        # For example, typical systems have 'python' for version 2.* and 'python3'
-        # for version 3.*. So looking for names per dir will find, potentially,
-        # systematically 'python' (i.e. version 2) even if version 3 is searched.
         _python_get_names (_${_PYTHON_PREFIX}_NAMES POSIX INTERPRETER)
+        unset (_${_PYTHON_PREFIX}_VALIDATE_OPTIONS)
         find_program (_${_PYTHON_PREFIX}_EXECUTABLE
-                      NAMES ${_${_PYTHON_PREFIX}_NAMES})
-        _python_validate_interpreter ()
+                      NAMES ${_${_PYTHON_PREFIX}_NAMES}
+                      NAMES_PER_DIR
+                      VALIDATOR _python_validate_find_interpreter)
       endif()
     endif()
   endif()
@@ -1805,7 +1861,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
       # Interpreter is not usable
       set (_${_PYTHON_PREFIX}_EXECUTABLE_USABLE FALSE)
       unset (${_PYTHON_PREFIX}_VERSION)
-      set (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE "Cannot run the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
+      set_property (CACHE _${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE PROPERTY VALUE "Cannot run the interpreter \"${_${_PYTHON_PREFIX}_EXECUTABLE}\"")
     endif()
   endif()
 
@@ -1853,7 +1909,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
       endif()
 
       if (${_PYTHON_PREFIX}_Interpreter_FOUND)
-        unset (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE)
+        unset (_${_PYTHON_PREFIX}_Interpreter_REASON_FAILURE CACHE)
 
         # compute and save interpreter signature
         string (MD5 __${_PYTHON_PREFIX}_INTERPRETER_SIGNATURE "${_${_PYTHON_PREFIX}_SIGNATURE}:${_${_PYTHON_PREFIX}_EXECUTABLE}")
@@ -2027,8 +2083,8 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NO_CMAKE_PATH
                         NO_CMAKE_ENVIRONMENT_PATH
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-          _python_validate_compiler (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
@@ -2041,9 +2097,10 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         HINTS ${_${_PYTHON_PREFIX}_IRON_ROOT} ${_${_PYTHON_PREFIX}_HINTS}
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-          _python_validate_compiler (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
@@ -2056,8 +2113,8 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                       HINTS ${_${_PYTHON_PREFIX}_IRON_ROOT} ${_${_PYTHON_PREFIX}_HINTS}
                       PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
                       NO_SYSTEM_ENVIRONMENT_PATH
-                      NO_CMAKE_SYSTEM_PATH)
-        _python_validate_compiler (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                      NO_CMAKE_SYSTEM_PATH
+                      VALIDATOR _python_validate_find_compiler)
         if (_${_PYTHON_PREFIX}_COMPILER)
           break()
         endif()
@@ -2066,8 +2123,8 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
         find_program (_${_PYTHON_PREFIX}_COMPILER
                       NAMES ${_${_PYTHON_PREFIX}_COMPILER_NAMES}
                       NAMES_PER_DIR
-                      PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES})
-        _python_validate_compiler (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                      PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                      VALIDATOR _python_validate_find_compiler)
         if (_${_PYTHON_PREFIX}_COMPILER)
           break()
         endif()
@@ -2079,12 +2136,13 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
-          _python_validate_compiler (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
         endif()
+
         # Windows registry
         if (CMAKE_HOST_WIN32 AND _${_PYTHON_PREFIX}_FIND_REGISTRY STREQUAL "LAST")
           find_program (_${_PYTHON_PREFIX}_COMPILER
@@ -2092,8 +2150,9 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
-          _python_validate_compiler (${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
@@ -2103,9 +2162,9 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
       endwhile()
     else()
       # try using root dir and registry
-      set (_${_PYTHON_PREFIX}_VALIDATE_OPTIONS EXACT)
+      set (_${_PYTHON_PREFIX}_COMMON_VALIDATE_OPTIONS EXACT)
       if (${_PYTHON_PREFIX}_FIND_VERSION_RANGE)
-        list (APPEND _${_PYTHON_PREFIX}_VALIDATE_OPTIONS IN_RANGE)
+        list (APPEND _${_PYTHON_PREFIX}_COMMON_VALIDATE_OPTIONS IN_RANGE)
       endif()
 
       foreach (_${_PYTHON_PREFIX}_VERSION IN LISTS _${_PYTHON_PREFIX}_FIND_VERSIONS)
@@ -2126,6 +2185,8 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                                 IMPLEMENTATIONS IronPython
                                 VERSION ${_${_PYTHON_PREFIX}_VERSION})
 
+        set (_${_PYTHON_PREFIX}_VALIDATE_OPTIONS VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_COMMON_VALIDATE_OPTIONS})
+
         # Apple frameworks handling
         if (CMAKE_HOST_APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "FIRST")
           find_program (_${_PYTHON_PREFIX}_COMPILER
@@ -2137,8 +2198,8 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NO_CMAKE_PATH
                         NO_CMAKE_ENVIRONMENT_PATH
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-          _python_validate_compiler (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
@@ -2151,9 +2212,10 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         HINTS ${_${_PYTHON_PREFIX}_IRON_ROOT} ${_${_PYTHON_PREFIX}_HINTS}
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
                         NO_SYSTEM_ENVIRONMENT_PATH
-                        NO_CMAKE_SYSTEM_PATH)
-          _python_validate_compiler (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_CMAKE_SYSTEM_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
@@ -2166,8 +2228,8 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                       HINTS ${_${_PYTHON_PREFIX}_IRON_ROOT} ${_${_PYTHON_PREFIX}_HINTS}
                       PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
                       NO_SYSTEM_ENVIRONMENT_PATH
-                      NO_CMAKE_SYSTEM_PATH)
-        _python_validate_compiler (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                      NO_CMAKE_SYSTEM_PATH
+                      VALIDATOR _python_validate_find_compiler)
         if (_${_PYTHON_PREFIX}_COMPILER)
           break()
         endif()
@@ -2179,8 +2241,8 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_FRAMEWORK_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
-          _python_validate_compiler (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
@@ -2192,8 +2254,9 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                         NAMES_PER_DIR
                         PATHS ${_${_PYTHON_PREFIX}_REGISTRY_PATHS}
                         PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
-                        NO_DEFAULT_PATH)
-          _python_validate_compiler (VERSION ${_${_PYTHON_PREFIX}_VERSION} ${_${_PYTHON_PREFIX}_VALIDATE_OPTIONS})
+                        ${_${_PYTHON_PREFIX}_REGISTRY_VIEW}
+                        NO_DEFAULT_PATH
+                        VALIDATOR _python_validate_find_compiler)
           if (_${_PYTHON_PREFIX}_COMPILER)
             break()
           endif()
@@ -2209,11 +2272,13 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
                                  IMPLEMENTATIONS IronPython
                                  VERSION ${_${_PYTHON_PREFIX}_FIND_VERSIONS}
                                  COMPILER)
+      unset (_${_PYTHON_PREFIX}_VALIDATE_OPTIONS)
       find_program (_${_PYTHON_PREFIX}_COMPILER
                     NAMES ${_${_PYTHON_PREFIX}_COMPILER_NAMES}
+                    NAMES_PER_DIR
                     HINTS ${_${_PYTHON_PREFIX}_IRON_ROOT} ${_${_PYTHON_PREFIX}_HINTS}
-                    PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES})
-      _python_validate_compiler ()
+                    PATH_SUFFIXES ${_${_PYTHON_PREFIX}_PATH_SUFFIXES}
+                    VALIDATOR _python_validate_find_compiler)
     endif()
   endif()
 
@@ -2254,7 +2319,7 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
     else()
       # compiler not usable
       set (_${_PYTHON_PREFIX}_COMPILER_USABLE FALSE)
-      set (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE "Cannot run the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
+      set_property (CACHE _${_PYTHON_PREFIX}_Compiler_REASON_FAILURE PROPERTY VALUE "Cannot run the compiler \"${_${_PYTHON_PREFIX}_COMPILER}\"")
     endif()
     file (REMOVE_RECURSE "${_${_PYTHON_PREFIX}_VERSION_DIR}")
   endif()
@@ -2273,7 +2338,7 @@ if ("Compiler" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
   endif()
 
   if (${_PYTHON_PREFIX}_Compiler_FOUND)
-    unset (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE)
+    unset (_${_PYTHON_PREFIX}_Compiler_REASON_FAILURE CACHE)
 
     # compute and save compiler signature
     string (MD5 __${_PYTHON_PREFIX}_COMPILER_SIGNATURE "${_${_PYTHON_PREFIX}_SIGNATURE}:${_${_PYTHON_PREFIX}_COMPILER}")
@@ -2755,7 +2820,7 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
     set (${_PYTHON_PREFIX}_LIBRARY_RELEASE "${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}")
 
     if (_${_PYTHON_PREFIX}_LIBRARY_RELEASE AND NOT EXISTS "${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}")
-      set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Cannot find the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
+      set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Cannot find the library \"${_${_PYTHON_PREFIX}_LIBRARY_RELEASE}\"")
       set_property (CACHE _${_PYTHON_PREFIX}_LIBRARY_RELEASE PROPERTY VALUE "${_PYTHON_PREFIX}_LIBRARY_RELEASE-NOTFOUND")
     endif()
 
@@ -2806,7 +2871,15 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
 
   if ("INCLUDE_DIR" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_ARTIFACTS)
     while (NOT _${_PYTHON_PREFIX}_INCLUDE_DIR)
-      if ("LIBRARY" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_ARTIFACTS
+      set (_${_PYTHON_PREFIX}_LIBRARY_REQUIRED TRUE)
+      foreach (_${_PYTHON_PREFIX}_COMPONENT IN ITEMS Module Embed)
+        string (TOUPPER "${_${_PYTHON_PREFIX}_COMPONENT}" _${_PYTHON_PREFIX}_ID)
+        if ("Development.${_${_PYTHON_PREFIX}_COMPONENT}" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+            AND NOT "LIBRARY" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_${_${_PYTHON_PREFIX}_ID}_ARTIFACTS)
+          set (_${_PYTHON_PREFIX}_LIBRARY_REQUIRED FALSE)
+        endif()
+      endforeach()
+      if (_${_PYTHON_PREFIX}_LIBRARY_REQUIRED
           AND NOT _${_PYTHON_PREFIX}_LIBRARY_RELEASE)
         # Don't search for include dir if no library was founded
         break()
@@ -2830,7 +2903,8 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
         endif()
         unset (_${_PYTHON_PREFIX}_INCLUDE_HINTS)
 
-        if (_${_PYTHON_PREFIX}_LIBRARY_RELEASE)
+        if ("LIBRARY" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_ARTIFACTS
+            AND _${_PYTHON_PREFIX}_LIBRARY_RELEASE)
           # Use the library's install prefix as a hint
           if (_${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "^(.+/Frameworks/Python.framework/Versions/[0-9.]+)")
             list (APPEND _${_PYTHON_PREFIX}_INCLUDE_HINTS "${CMAKE_MATCH_1}")
@@ -2907,19 +2981,25 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
     set (${_PYTHON_PREFIX}_INCLUDE_DIRS "${_${_PYTHON_PREFIX}_INCLUDE_DIR}")
 
     if (_${_PYTHON_PREFIX}_INCLUDE_DIR AND NOT EXISTS "${_${_PYTHON_PREFIX}_INCLUDE_DIR}")
-      set (_${_PYTHON_PREFIX}_Development_REASON_FAILURE "Cannot find the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"")
+      set_property (CACHE _${_PYTHON_PREFIX}_Development_REASON_FAILURE PROPERTY VALUE "Cannot find the directory \"${_${_PYTHON_PREFIX}_INCLUDE_DIR}\"")
       set_property (CACHE _${_PYTHON_PREFIX}_INCLUDE_DIR PROPERTY VALUE "${_PYTHON_PREFIX}_INCLUDE_DIR-NOTFOUND")
     endif()
 
     if (_${_PYTHON_PREFIX}_INCLUDE_DIR)
       # retrieve version from header file
       _python_get_version (INCLUDE PREFIX _${_PYTHON_PREFIX}_INC_)
-      if (_${_PYTHON_PREFIX}_LIBRARY_RELEASE)
+      if ("LIBRARY" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_ARTIFACTS
+          AND _${_PYTHON_PREFIX}_LIBRARY_RELEASE)
         if ("${_${_PYTHON_PREFIX}_INC_VERSION_MAJOR}.${_${_PYTHON_PREFIX}_INC_VERSION_MINOR}"
             VERSION_EQUAL _${_PYTHON_PREFIX}_VERSION)
           # update versioning
           set (_${_PYTHON_PREFIX}_VERSION ${_${_PYTHON_PREFIX}_INC_VERSION})
           set (_${_PYTHON_PREFIX}_VERSION_PATCH ${_${_PYTHON_PREFIX}_INC_VERSION_PATCH})
+        elseif (_${_PYTHON_PREFIX}_VERSION VERSION_EQUAL _${_PYTHON_PREFIX}_INC_VERSION_MAJOR)
+          # library specify only major version, use include file for full version information
+          set (_${_PYTHON_PREFIX}_VERSION ${_${_PYTHON_PREFIX}_INC_VERSION})
+          set (_${_PYTHON_PREFIX}_VERSION_MINOR ${_${_PYTHON_PREFIX}_INC_VERSION_MINOR})
+          set (_${_PYTHON_PREFIX}_VERSION_PATCH ${_${_PYTHON_PREFIX}_INC_VERSION_PATCH})
         endif()
       else()
         set (_${_PYTHON_PREFIX}_VERSION ${_${_PYTHON_PREFIX}_INC_VERSION})
@@ -2995,7 +3075,7 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
         AND ${_PYTHON_PREFIX}_Development.Embed_FOUND)
       OR (NOT "Development.Embed" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
         AND ${_PYTHON_PREFIX}_Development.Module_FOUND))
-    unset (_${_PYTHON_PREFIX}_Development_REASON_FAILURE)
+    unset (_${_PYTHON_PREFIX}_Development_REASON_FAILURE CACHE)
   endif()
 
   if ("Development" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
@@ -3106,7 +3186,7 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS AND ${_PYTHON_PREFIX}_Inte
   set (${_PYTHON_PREFIX}_NumPy_INCLUDE_DIRS "${_${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR}")
 
   if(_${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR AND NOT EXISTS "${_${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR}")
-    set (_${_PYTHON_PREFIX}_NumPy_REASON_FAILURE "Cannot find the directory \"${_${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR}\"")
+    set_property (CACHE _${_PYTHON_PREFIX}_NumPy_REASON_FAILURE PROPERTY VALUE "Cannot find the directory \"${_${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR}\"")
     set_property (CACHE _${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR PROPERTY VALUE "${_PYTHON_PREFIX}_NumPy_INCLUDE_DIR-NOTFOUND")
   endif()
 
@@ -3128,7 +3208,7 @@ if ("NumPy" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS AND ${_PYTHON_PREFIX}_Inte
   endif()
 
   if (${_PYTHON_PREFIX}_NumPy_FOUND)
-    unset (_${_PYTHON_PREFIX}_NumPy_REASON_FAILURE)
+    unset (_${_PYTHON_PREFIX}_NumPy_REASON_FAILURE CACHE)
 
     # compute and save numpy signature
     string (MD5 __${_PYTHON_PREFIX}_NUMPY_SIGNATURE "${_${_PYTHON_PREFIX}_INTERPRETER_SIGNATURE}:${_${_PYTHON_PREFIX}_DEVELOPMENT_MODULE_SIGNATURE}:${${_PYTHON_PREFIX}_NumPyINCLUDE_DIR}")
@@ -3158,7 +3238,7 @@ unset (_${_PYTHON_PREFIX}_REASON_FAILURE)
 foreach (_${_PYTHON_PREFIX}_COMPONENT IN ITEMS Interpreter Compiler Development NumPy)
   if (_${_PYTHON_PREFIX}_${_${_PYTHON_PREFIX}_COMPONENT}_REASON_FAILURE)
     string (APPEND _${_PYTHON_PREFIX}_REASON_FAILURE "\n        ${_${_PYTHON_PREFIX}_COMPONENT}: ${_${_PYTHON_PREFIX}_${_${_PYTHON_PREFIX}_COMPONENT}_REASON_FAILURE}")
-    unset (_${_PYTHON_PREFIX}_${_${_PYTHON_PREFIX}_COMPONENT}_REASON_FAILURE)
+    unset (_${_PYTHON_PREFIX}_${_${_PYTHON_PREFIX}_COMPONENT}_REASON_FAILURE CACHE)
   endif()
 endforeach()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPython2.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPython2.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindPython2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPython2.cmake
index bb965b9d..268acfef 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPython2.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPython2.cmake
@@ -215,6 +215,11 @@ Hints
   * If set to TRUE, search **only** for static libraries.
   * If set to FALSE, search **only** for shared libraries.
 
+  .. note::
+
+    This hint will be ignored on ``Windows`` because static libraries are not
+    available on this platform.
+
 ``Python2_FIND_STRATEGY``
   .. versionadded:: 3.15
 
@@ -297,7 +302,7 @@ Hints
     ``Anaconda`` or ``ActivePython``, rely on this implementation.
   * ``IronPython``: This implementation use the ``CSharp`` language for
     ``.NET Framework`` on top of the `Dynamic Language Runtime` (``DLR``).
-    See `IronPython <http://ironpython.net>`_.
+    See `IronPython <https://ironpython.net>`_.
   * ``PyPy``: This implementation use ``RPython`` language and
     ``RPython translation toolchain`` to produce the python interpreter.
     See `PyPy <https://www.pypy.org>`_.
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPython3.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPython3.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindPython3.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPython3.cmake
index f826fcfe..4f198bb5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPython3.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPython3.cmake
@@ -231,11 +231,16 @@ Hints
   * If set to TRUE, search **only** for static libraries.
   * If set to FALSE, search **only** for shared libraries.
 
+  .. note::
+
+    This hint will be ignored on ``Windows`` because static libraries are not
+    available on this platform.
+
 ``Python3_FIND_ABI``
   .. versionadded:: 3.16
 
-  This variable defines which ABIs, as defined in
-  `PEP 3149 <https://www.python.org/dev/peps/pep-3149/>`_, should be searched.
+  This variable defines which ABIs, as defined in :pep:`3149`, should be
+  searched.
 
   .. note::
 
@@ -356,7 +361,7 @@ Hints
     ``Anaconda`` or ``ActivePython``, rely on this implementation.
   * ``IronPython``: This implementation use the ``CSharp`` language for
     ``.NET Framework`` on top of the `Dynamic Language Runtime` (``DLR``).
-    See `IronPython <http://ironpython.net>`_.
+    See `IronPython <https://ironpython.net>`_.
   * ``PyPy``: This implementation use ``RPython`` language and
     ``RPython translation toolchain`` to produce the python interpreter.
     See `PyPy <https://www.pypy.org>`_.
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPythonInterp.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPythonInterp.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindPythonInterp.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPythonInterp.cmake
index efe0f119..7ad35878 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPythonInterp.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPythonInterp.cmake
@@ -54,7 +54,7 @@ unset(_Python_NAMES)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonInterp_FIND_VERSION)
     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindPythonLibs.cmake b/deps/cmake/share/cmake-3.25/Modules/FindPythonLibs.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindPythonLibs.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindPythonLibs.cmake
index 396f0d2e..43a84dd7 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindPythonLibs.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindPythonLibs.cmake
@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST)
 
 set(_PYTHON1_VERSIONS 1.6 1.5)
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
-set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+set(_PYTHON3_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
 
 if(PythonLibs_FIND_VERSION)
     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindQt.cmake b/deps/cmake/share/cmake-3.25/Modules/FindQt.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindQt.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindQt.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindQt3.cmake b/deps/cmake/share/cmake-3.25/Modules/FindQt3.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindQt3.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindQt3.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindQt4.cmake b/deps/cmake/share/cmake-3.25/Modules/FindQt4.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindQt4.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindQt4.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindQuickTime.cmake b/deps/cmake/share/cmake-3.25/Modules/FindQuickTime.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindQuickTime.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindQuickTime.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindRTI.cmake b/deps/cmake/share/cmake-3.25/Modules/FindRTI.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindRTI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindRTI.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindRuby.cmake b/deps/cmake/share/cmake-3.25/Modules/FindRuby.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/FindRuby.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindRuby.cmake
index 759f57c2..d82f41da 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindRuby.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindRuby.cmake
@@ -8,7 +8,7 @@ FindRuby
 Find Ruby
 
 This module finds if Ruby is installed and determines where the
-include files and libraries are.  Ruby 1.8 through 2.7 are
+include files and libraries are.  Ruby 1.8 through 3.1 are
 supported.
 
 The minimum required version of Ruby can be specified using the
@@ -71,9 +71,6 @@ Hints
 
 .. versionadded:: 3.18
 
-``Ruby_ROOT_DIR``
-  Define the root directory of a Ruby installation.
-
 ``Ruby_FIND_VIRTUALENV``
   This variable defines the handling of virtual environments managed by
   ``rvm``. It is meaningful only when a virtual environment
@@ -139,13 +136,13 @@ set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION
 
 # Set name of possible executables, ignoring the minor
 # Eg:
-# 2.1.1 => from ruby27 to ruby21 included
-# 2.1   => from ruby27 to ruby21 included
-# 2     => from ruby26 to ruby20 included
-# empty => from ruby27 to ruby18 included
+# 2.1.1 => from ruby31 to ruby21 included
+# 2.1   => from ruby31 to ruby21 included
+# 2     => from ruby31 to ruby20 included
+# empty => from ruby31 to ruby18 included
 if(NOT Ruby_FIND_VERSION_EXACT)
 
-  foreach(_ruby_version RANGE 27 18 -1)
+  foreach(_ruby_version RANGE 31 18 -1)
     string(SUBSTRING "${_ruby_version}" 0 1 _ruby_major_version)
     string(SUBSTRING "${_ruby_version}" 1 1 _ruby_minor_version)
 
@@ -266,9 +263,20 @@ while(1)
   _RUBY_VALIDATE_INTERPRETER (${Ruby_FIND_VERSION})
   if (Ruby_EXECUTABLE)
     break()
+  else()
+    # Remove first entry from names list.
+    LIST(REMOVE_AT _Ruby_POSSIBLE_EXECUTABLE_NAMES 0)
+
+    # If the list is now empty, abort.
+    if (NOT _Ruby_POSSIBLE_EXECUTABLE_NAMES)
+      break()
+    else()
+      # Otherwise, continue with the remaining list. Make sure that we clear
+      # the cached variable.
+      unset(Ruby_EXECUTABLE CACHE)
+    endif()
   endif()
 
-  break()
 endwhile()
 
 if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_MAJOR)
@@ -358,46 +366,17 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_MAJOR)
     set(Ruby_VERSION_MAJOR 1)
     set(Ruby_VERSION_MINOR 9)
   endif()
-  # check whether we found 2.0.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?0")
+  # check whether we found 2.[0-7].x
+  if(${Ruby_EXECUTABLE} MATCHES "ruby2")
     set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 0)
+    string(REGEX_REPLACE ${Ruby_EXECUTABLE} "ruby2\\.?([0-7])" "\\1" Ruby_VERSION_MINOR)
   endif()
-  # check whether we found 2.1.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?1")
-    set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 1)
-  endif()
-  # check whether we found 2.2.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?2")
-    set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 2)
-  endif()
-  # check whether we found 2.3.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?3")
-    set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 3)
-  endif()
-  # check whether we found 2.4.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?4")
-    set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 4)
-  endif()
-  # check whether we found 2.5.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?5")
-    set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 5)
-  endif()
-  # check whether we found 2.6.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?6")
-    set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 6)
-  endif()
-  # check whether we found 2.7.x
-  if(${Ruby_EXECUTABLE} MATCHES "ruby2\\.?7")
-    set(Ruby_VERSION_MAJOR 2)
-    set(Ruby_VERSION_MINOR 7)
+  # check whether we found 3.[0-1].x
+  if(${Ruby_EXECUTABLE} MATCHES "ruby3")
+    set(Ruby_VERSION_MAJOR 3)
+    string(REGEX_REPLACE ${Ruby_EXECUTABLE} "ruby3\\.?([0-1])" "\\1" Ruby_VERSION_MINOR)
   endif()
+
 endif()
 
 if(Ruby_VERSION_MAJOR)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSDL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSDL.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindSDL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSDL.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/FindSDL_gfx.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSDL_gfx.cmake
new file mode 100644
index 00000000..2dd96e98
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FindSDL_gfx.cmake
@@ -0,0 +1,86 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindSDL_gfx
+-----------
+
+.. versionadded:: 3.25
+
+Locate SDL_gfx library
+
+This module defines:
+
+::
+
+  SDL::SDL_gfx, the name of the target to use with target_*() commands
+  SDL_GFX_LIBRARIES, the name of the library to link against
+  SDL_GFX_INCLUDE_DIRS, where to find the headers
+  SDL_GFX_FOUND, if false, do not try to link against
+  SDL_GFX_VERSION_STRING - human-readable string containing the
+                             version of SDL_gfx
+
+``$SDLDIR`` is an environment variable that would correspond to the
+``./configure --prefix=$SDLDIR`` used in building SDL.
+#]=======================================================================]
+
+find_path(SDL_GFX_INCLUDE_DIRS
+  NAMES
+    SDL_framerate.h
+    SDL_gfxBlitFunc.h
+    SDL_gfxPrimitives.h
+    SDL_gfxPrimitives_font.h
+    SDL_imageFilter.h
+    SDL_rotozoom.h
+  HINTS
+    ENV SDLGFXDIR
+    ENV SDLDIR
+  PATH_SUFFIXES SDL
+                # path suffixes to search inside ENV{SDLDIR}
+                include/SDL include/SDL12 include/SDL11 include
+)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(VC_LIB_PATH_SUFFIX lib/x64)
+else()
+  set(VC_LIB_PATH_SUFFIX lib/x86)
+endif()
+
+find_library(SDL_GFX_LIBRARIES
+  NAMES SDL_gfx
+  HINTS
+    ENV SDLGFXDIR
+    ENV SDLDIR
+  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
+)
+
+if(SDL_GFX_INCLUDE_DIRS AND EXISTS "${SDL_GFX_INCLUDE_DIRS}/SDL_gfxPrimitives.h")
+  file(STRINGS "${SDL_GFX_INCLUDE_DIRS}/SDL_gfxPrimitives.h" SDL_GFX_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_GFXPRIMITIVES_MAJOR[ \t]+[0-9]+$")
+  file(STRINGS "${SDL_GFX_INCLUDE_DIRS}/SDL_gfxPrimitives.h" SDL_GFX_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_GFXPRIMITIVES_MINOR[ \t]+[0-9]+$")
+  file(STRINGS "${SDL_GFX_INCLUDE_DIRS}/SDL_gfxPrimitives.h" SDL_GFX_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_GFXPRIMITIVES_MICRO[ \t]+[0-9]+$")
+  string(REGEX REPLACE "^#define[ \t]+SDL_GFXPRIMITIVES_MAJOR[ \t]+([0-9]+)$" "\\1" SDL_GFX_VERSION_MAJOR "${SDL_GFX_VERSION_MAJOR_LINE}")
+  string(REGEX REPLACE "^#define[ \t]+SDL_GFXPRIMITIVES_MINOR[ \t]+([0-9]+)$" "\\1" SDL_GFX_VERSION_MINOR "${SDL_GFX_VERSION_MINOR_LINE}")
+  string(REGEX REPLACE "^#define[ \t]+SDL_GFXPRIMITIVES_MICRO[ \t]+([0-9]+)$" "\\1" SDL_GFX_VERSION_PATCH "${SDL_GFX_VERSION_PATCH_LINE}")
+  set(SDL_GFX_VERSION_STRING ${SDL_GFX_VERSION_MAJOR}.${SDL_GFX_VERSION_MINOR}.${SDL_GFX_VERSION_PATCH})
+  unset(SDL_GFX_VERSION_MAJOR_LINE)
+  unset(SDL_GFX_VERSION_MINOR_LINE)
+  unset(SDL_GFX_VERSION_PATCH_LINE)
+  unset(SDL_GFX_VERSION_MAJOR)
+  unset(SDL_GFX_VERSION_MINOR)
+  unset(SDL_GFX_VERSION_PATCH)
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL_gfx
+                                  REQUIRED_VARS SDL_GFX_LIBRARIES SDL_GFX_INCLUDE_DIRS
+                                  VERSION_VAR SDL_GFX_VERSION_STRING)
+
+if(SDL_gfx_FOUND)
+  if(NOT TARGET SDL::SDL_gfx)
+    add_library(SDL::SDL_gfx INTERFACE IMPORTED)
+    set_target_properties(SDL::SDL_gfx PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${SDL_GFX_INCLUDE_DIRS}"
+      INTERFACE_LINK_LIBRARIES "${SDL_GFX_LIBRARIES}")
+  endif()
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSDL_image.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSDL_image.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindSDL_image.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSDL_image.cmake
index e687b498..324fef5d 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindSDL_image.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindSDL_image.cmake
@@ -31,10 +31,6 @@ For backward compatibility the following variables are also set:
 
 $SDLDIR is an environment variable that would correspond to the
 ./configure --prefix=$SDLDIR used in building SDL.
-
-Created by Eric Wing.  This was influenced by the FindSDL.cmake
-module, but with modifications to recognize OS X frameworks and
-additional Unix paths (FreeBSD, etc).
 #]=======================================================================]
 
 if(NOT SDL_IMAGE_INCLUDE_DIR AND SDLIMAGE_INCLUDE_DIR)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSDL_mixer.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSDL_mixer.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindSDL_mixer.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSDL_mixer.cmake
index 315400a3..8ed3cb4b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindSDL_mixer.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindSDL_mixer.cmake
@@ -31,10 +31,6 @@ For backward compatibility the following variables are also set:
 
 $SDLDIR is an environment variable that would correspond to the
 ./configure --prefix=$SDLDIR used in building SDL.
-
-Created by Eric Wing.  This was influenced by the FindSDL.cmake
-module, but with modifications to recognize OS X frameworks and
-additional Unix paths (FreeBSD, etc).
 #]=======================================================================]
 
 if(NOT SDL_MIXER_INCLUDE_DIR AND SDLMIXER_INCLUDE_DIR)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSDL_net.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSDL_net.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindSDL_net.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSDL_net.cmake
index 28cb4d6c..639e5bd7 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindSDL_net.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindSDL_net.cmake
@@ -30,10 +30,6 @@ For backward compatibility the following variables are also set:
 
 $SDLDIR is an environment variable that would correspond to the
 ./configure --prefix=$SDLDIR used in building SDL.
-
-Created by Eric Wing.  This was influenced by the FindSDL.cmake
-module, but with modifications to recognize OS X frameworks and
-additional Unix paths (FreeBSD, etc).
 #]=======================================================================]
 
 if(NOT SDL_NET_INCLUDE_DIR AND SDLNET_INCLUDE_DIR)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSDL_sound.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSDL_sound.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindSDL_sound.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSDL_sound.cmake
index 8d2f9f8f..d863e3c1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindSDL_sound.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindSDL_sound.cmake
@@ -54,7 +54,19 @@ Typically, you should not use these variables directly, and you should
 use SDL_SOUND_LIBRARIES which contains SDL_SOUND_LIBRARY and the other
 audio libraries (if needed) to successfully compile on your system.
 
-Created by Eric Wing.  This module is a bit more complicated than the
+Responds to the $SDLDIR and $SDLSOUNDDIR environmental variable that
+would correspond to the ./configure --prefix=$SDLDIR used in building
+SDL.
+
+On OSX, this will prefer the Framework version (if found) over others.
+People will have to manually change the cache values of SDL_LIBRARY to
+override this selectionor set the CMake environment CMAKE_INCLUDE_PATH
+to modify the search paths.
+#]=======================================================================]
+
+
+#[[
+This module is a bit more complicated than the
 other FindSDL* family modules.  The reason is that SDL_sound can be
 compiled in a large variety of different ways which are independent of
 platform.  SDL_sound may dynamically link against other 3rd party
@@ -70,16 +82,7 @@ This module uses a brute force approach to create a test program that
 uses SDL_sound, and then tries to build it.  If the build fails, it
 parses the error output for known symbol names to figure out which
 libraries are needed.
-
-Responds to the $SDLDIR and $SDLSOUNDDIR environmental variable that
-would correspond to the ./configure --prefix=$SDLDIR used in building
-SDL.
-
-On OSX, this will prefer the Framework version (if found) over others.
-People will have to manually change the cache values of SDL_LIBRARY to
-override this selectionor set the CMake environment CMAKE_INCLUDE_PATH
-to modify the search paths.
-#]=======================================================================]
+#]]
 
 set(SDL_SOUND_EXTRAS "" CACHE STRING "SDL_sound extra flags")
 mark_as_advanced(SDL_SOUND_EXTRAS)
@@ -182,9 +185,9 @@ if(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
 
   try_compile(
     MY_RESULT
-    ${PROJECT_BINARY_DIR}/CMakeTmp
-    ${PROJECT_BINARY_DIR}/CMakeTmp
-    DetermineSoundLibs
+    PROJECT DetermineSoundLibs
+    SOURCE_DIR ${PROJECT_BINARY_DIR}/CMakeTmp
+    BINARY_DIR ${PROJECT_BINARY_DIR}/CMakeTmp
     OUTPUT_VARIABLE MY_OUTPUT
     )
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSDL_ttf.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSDL_ttf.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/FindSDL_ttf.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSDL_ttf.cmake
index d5721da0..d67c0893 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindSDL_ttf.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindSDL_ttf.cmake
@@ -30,10 +30,6 @@ For backward compatibility the following variables are also set:
 
 $SDLDIR is an environment variable that would correspond to the
 ./configure --prefix=$SDLDIR used in building SDL.
-
-Created by Eric Wing.  This was influenced by the FindSDL.cmake
-module, but with modifications to recognize OS X frameworks and
-additional Unix paths (FreeBSD, etc).
 #]=======================================================================]
 
 if(NOT SDL_TTF_INCLUDE_DIR AND SDLTTF_INCLUDE_DIR)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSQLite3.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSQLite3.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindSQLite3.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSQLite3.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSWIG.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSWIG.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindSWIG.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSWIG.cmake
index 7c610d97..370fff05 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindSWIG.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindSWIG.cmake
@@ -54,7 +54,7 @@ optional Fortran support:
      endif()
    endif()
 
-.. _`SWIG`: http://swig.org
+.. _SWIG: https://swig.org
 
 #]=======================================================================]
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSelfPackers.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSelfPackers.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindSelfPackers.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSelfPackers.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSquish.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSquish.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindSquish.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSquish.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindSubversion.cmake b/deps/cmake/share/cmake-3.25/Modules/FindSubversion.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindSubversion.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindSubversion.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindTCL.cmake b/deps/cmake/share/cmake-3.25/Modules/FindTCL.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindTCL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindTCL.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindTIFF.cmake b/deps/cmake/share/cmake-3.25/Modules/FindTIFF.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindTIFF.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindTIFF.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindTclStub.cmake b/deps/cmake/share/cmake-3.25/Modules/FindTclStub.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindTclStub.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindTclStub.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindTclsh.cmake b/deps/cmake/share/cmake-3.25/Modules/FindTclsh.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindTclsh.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindTclsh.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindThreads.cmake b/deps/cmake/share/cmake-3.25/Modules/FindThreads.cmake
similarity index 76%
rename from deps/cmake/share/cmake-3.21/Modules/FindThreads.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindThreads.cmake
index c6a3451f..7326ef93 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindThreads.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindThreads.cmake
@@ -91,12 +91,27 @@ int main(void)
 
 # Internal helper macro.
 # Do NOT even think about using it outside of this file!
-macro(_check_threads_lib LIBNAME FUNCNAME VARNAME)
+macro(_threads_check_libc)
+  if(NOT Threads_FOUND)
+    if(CMAKE_C_COMPILER_LOADED)
+      CHECK_C_SOURCE_COMPILES("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD)
+    elseif(CMAKE_CXX_COMPILER_LOADED)
+      CHECK_CXX_SOURCE_COMPILES("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD)
+    endif()
+    if(CMAKE_HAVE_LIBC_PTHREAD)
+      set(CMAKE_THREAD_LIBS_INIT "")
+      set(Threads_FOUND TRUE)
+    endif()
+  endif ()
+endmacro()
+
+# Internal helper macro.
+# Do NOT even think about using it outside of this file!
+macro(_threads_check_lib LIBNAME FUNCNAME VARNAME)
   if(NOT Threads_FOUND)
      CHECK_LIBRARY_EXISTS(${LIBNAME} ${FUNCNAME} "" ${VARNAME})
      if(${VARNAME})
        set(CMAKE_THREAD_LIBS_INIT "-l${LIBNAME}")
-       set(CMAKE_HAVE_THREADS_LIBRARY 1)
        set(Threads_FOUND TRUE)
      endif()
   endif ()
@@ -104,20 +119,22 @@ endmacro()
 
 # Internal helper macro.
 # Do NOT even think about using it outside of this file!
-macro(_check_pthreads_flag)
+macro(_threads_check_flag_pthread)
   if(NOT Threads_FOUND)
-    # If we did not found -lpthread, -lpthread, or -lthread, look for -pthread
-    if(NOT DEFINED THREADS_HAVE_PTHREAD_ARG)
+    # If we did not find -lpthreads, -lpthread, or -lthread, look for -pthread
+    # except on compilers known to not have it.
+    if(MSVC)
+      # Compilers targeting the MSVC ABI do not have a -pthread flag.
+      set(THREADS_HAVE_PTHREAD_ARG FALSE)
+    elseif(NOT DEFINED THREADS_HAVE_PTHREAD_ARG)
       message(CHECK_START "Check if compiler accepts -pthread")
       if(CMAKE_C_COMPILER_LOADED)
-        set(_threads_src ${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c)
+        set(_threads_src CheckForPthreads.c)
       elseif(CMAKE_CXX_COMPILER_LOADED)
-        set(_threads_src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/FindThreads/CheckForPthreads.cxx)
-        configure_file(${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c "${_threads_src}" COPYONLY)
+        set(_threads_src CheckForPthreads.cxx)
       endif()
       try_compile(THREADS_HAVE_PTHREAD_ARG
-        ${CMAKE_BINARY_DIR}
-        ${_threads_src}
+        SOURCE_FROM_FILE "${_threads_src}" "${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c"
         CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
         OUTPUT_VARIABLE _cmake_check_pthreads_output)
 
@@ -141,54 +158,27 @@ macro(_check_pthreads_flag)
   endif()
 endmacro()
 
-# Do we have pthreads?
-if(CMAKE_C_COMPILER_LOADED)
-  CHECK_INCLUDE_FILE("pthread.h" CMAKE_HAVE_PTHREAD_H)
-else()
-  CHECK_INCLUDE_FILE_CXX("pthread.h" CMAKE_HAVE_PTHREAD_H)
+# Check if pthread functions are in normal C library.
+# We list some pthread functions in PTHREAD_C_CXX_TEST_SOURCE test code.
+# If the pthread functions already exist in C library, we could just use
+# them instead of linking to the additional pthread library.
+_threads_check_libc()
+
+# Check for -pthread first if enabled. This is the recommended
+# way, but not backwards compatible as one must also pass -pthread
+# as compiler flag then.
+if (THREADS_PREFER_PTHREAD_FLAG)
+  _threads_check_flag_pthread()
+endif ()
+
+if(CMAKE_SYSTEM MATCHES "GHS-MULTI")
+  _threads_check_lib(posix pthread_create CMAKE_HAVE_PTHREADS_CREATE)
 endif()
+_threads_check_lib(pthreads pthread_create CMAKE_HAVE_PTHREADS_CREATE)
+_threads_check_lib(pthread  pthread_create CMAKE_HAVE_PTHREAD_CREATE)
 
-if(CMAKE_HAVE_PTHREAD_H)
-  #
-  # We have pthread.h
-  # Let's check for the library now.
-  #
-  set(CMAKE_HAVE_THREADS_LIBRARY)
-  if(NOT THREADS_HAVE_PTHREAD_ARG)
-    # Check if pthread functions are in normal C library.
-    # We list some pthread functions in PTHREAD_C_CXX_TEST_SOURCE test code.
-    # If the pthread functions already exist in C library, we could just use
-    # them instead of linking to the additional pthread library.
-    if(CMAKE_C_COMPILER_LOADED)
-      CHECK_C_SOURCE_COMPILES("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD)
-    elseif(CMAKE_CXX_COMPILER_LOADED)
-      CHECK_CXX_SOURCE_COMPILES("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD)
-    endif()
-    if(CMAKE_HAVE_LIBC_PTHREAD)
-      set(CMAKE_THREAD_LIBS_INIT "")
-      set(CMAKE_HAVE_THREADS_LIBRARY 1)
-      set(Threads_FOUND TRUE)
-    else()
-      # Check for -pthread first if enabled. This is the recommended
-      # way, but not backwards compatible as one must also pass -pthread
-      # as compiler flag then.
-      if (THREADS_PREFER_PTHREAD_FLAG)
-         _check_pthreads_flag()
-      endif ()
-
-      if(CMAKE_SYSTEM MATCHES "GHS-MULTI")
-        _check_threads_lib(posix pthread_create CMAKE_HAVE_PTHREADS_CREATE)
-      endif()
-      _check_threads_lib(pthreads pthread_create CMAKE_HAVE_PTHREADS_CREATE)
-      _check_threads_lib(pthread  pthread_create CMAKE_HAVE_PTHREAD_CREATE)
-      if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-          # On sun also check for -lthread
-          _check_threads_lib(thread thr_create CMAKE_HAVE_THR_CREATE)
-      endif()
-    endif()
-  endif()
-
-  _check_pthreads_flag()
+if (NOT THREADS_PREFER_PTHREAD_FLAG)
+  _threads_check_flag_pthread()
 endif()
 
 if(CMAKE_THREAD_LIBS_INIT OR CMAKE_HAVE_LIBC_PTHREAD)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindUnixCommands.cmake b/deps/cmake/share/cmake-3.25/Modules/FindUnixCommands.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindUnixCommands.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindUnixCommands.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/FindVulkan.cmake b/deps/cmake/share/cmake-3.25/Modules/FindVulkan.cmake
new file mode 100644
index 00000000..38179878
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/FindVulkan.cmake
@@ -0,0 +1,890 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#[=======================================================================[.rst:
+FindVulkan
+----------
+
+.. versionadded:: 3.7
+
+Find Vulkan, which is a low-overhead, cross-platform 3D graphics
+and computing API.
+
+Optional COMPONENTS
+^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.24
+
+This module respects several optional COMPONENTS.
+There are corresponding imported targets for each of these.
+
+``glslc``
+  The SPIR-V compiler.
+
+``glslangValidator``
+  The ``glslangValidator`` tool.
+
+``glslang``
+  The SPIR-V generator library.
+
+``shaderc_combined``
+  The static library for Vulkan shader compilation.
+
+``SPIRV-Tools``
+  Tools to process SPIR-V modules.
+
+``MoltenVK``
+  On macOS, an additional component ``MoltenVK`` is available.
+
+``dxc``
+  .. versionadded:: 3.25
+
+  The DirectX Shader Compiler.
+
+The ``glslc`` and ``glslangValidator`` components are provided even
+if not explicitly requested (for backward compatibility).
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` targets if Vulkan has been found:
+
+``Vulkan::Vulkan``
+  The main Vulkan library.
+
+``Vulkan::glslc``
+  .. versionadded:: 3.19
+
+  The GLSLC SPIR-V compiler, if it has been found.
+
+``Vulkan::Headers``
+  .. versionadded:: 3.21
+
+  Provides just Vulkan headers include paths, if found.  No library is
+  included in this target.  This can be useful for applications that
+  load Vulkan library dynamically.
+
+``Vulkan::glslangValidator``
+  .. versionadded:: 3.21
+
+  The glslangValidator tool, if found.  It is used to compile GLSL and
+  HLSL shaders into SPIR-V.
+
+``Vulkan::glslang``
+  .. versionadded:: 3.24
+
+  Defined if SDK has the Khronos-reference front-end shader parser and SPIR-V
+  generator library (glslang).
+
+``Vulkan::shaderc_combined``
+  .. versionadded:: 3.24
+
+  Defined if SDK has the Google static library for Vulkan shader compilation
+  (shaderc_combined).
+
+``Vulkan::SPIRV-Tools``
+  .. versionadded:: 3.24
+
+  Defined if SDK has the Khronos library to process SPIR-V modules
+  (SPIRV-Tools).
+
+``Vulkan::MoltenVK``
+  .. versionadded:: 3.24
+
+  Defined if SDK has the Khronos library which implement a subset of Vulkan API
+  over Apple Metal graphics framework. (MoltenVK).
+
+``Vulkan::volk``
+  .. versionadded:: 3.25
+
+  Defined if SDK has the Vulkan meta-loader (volk).
+
+``Vulkan::dxc_lib``
+  .. versionadded:: 3.25
+
+  Defined if SDK has the DirectX shader compiler library.
+
+``Vulkan::dxc_exe``
+  .. versionadded:: 3.25
+
+  Defined if SDK has the DirectX shader compiler CLI tool.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+``Vulkan_FOUND``
+  set to true if Vulkan was found
+``Vulkan_INCLUDE_DIRS``
+  include directories for Vulkan
+``Vulkan_LIBRARIES``
+  link against this library to use Vulkan
+``Vulkan_VERSION``
+  .. versionadded:: 3.23
+
+  value from ``vulkan/vulkan_core.h``
+``Vulkan_glslc_FOUND``
+  .. versionadded:: 3.24
+
+  True, if the SDK has the glslc executable.
+``Vulkan_glslangValidator_FOUND``
+  .. versionadded:: 3.24
+
+  True, if the SDK has the glslangValidator executable.
+``Vulkan_glslang_FOUND``
+  .. versionadded:: 3.24
+
+  True, if the SDK has the glslang library.
+``Vulkan_shaderc_combined_FOUND``
+  .. versionadded:: 3.24
+
+  True, if the SDK has the shaderc_combined library.
+``Vulkan_SPIRV-Tools_FOUND``
+  .. versionadded:: 3.24
+
+  True, if the SDK has the SPIRV-Tools library.
+``Vulkan_MoltenVK_FOUND``
+  .. versionadded:: 3.24
+
+  True, if the SDK has the MoltenVK library.
+``Vulkan_volk_FOUND``
+  .. versionadded:: 3.25
+
+  True, if the SDK has the volk library.
+
+``Vulkan_dxc_lib_FOUND``
+  .. versionadded:: 3.25
+
+  True, if the SDK has the DirectX shader compiler library.
+
+``Vulkan_dxc_exe_FOUND``
+  .. versionadded:: 3.25
+
+  True, if the SDK has the DirectX shader compiler CLI tool.
+
+
+The module will also defines these cache variables:
+
+``Vulkan_INCLUDE_DIR``
+  the Vulkan include directory
+``Vulkan_LIBRARY``
+  the path to the Vulkan library
+``Vulkan_GLSLC_EXECUTABLE``
+  the path to the GLSL SPIR-V compiler
+``Vulkan_GLSLANG_VALIDATOR_EXECUTABLE``
+  the path to the glslangValidator tool
+``Vulkan_glslang_LIBRARY``
+  .. versionadded:: 3.24
+
+  Path to the glslang library.
+``Vulkan_shaderc_combined_LIBRARY``
+  .. versionadded:: 3.24
+
+  Path to the shaderc_combined library.
+``Vulkan_SPIRV-Tools_LIBRARY``
+  .. versionadded:: 3.24
+
+  Path to the SPIRV-Tools library.
+``Vulkan_MoltenVK_LIBRARY``
+  .. versionadded:: 3.24
+
+  Path to the MoltenVK library.
+
+``Vulkan_volk_LIBRARY``
+  .. versionadded:: 3.25
+
+  Path to the volk library.
+
+``Vulkan_dxc_LIBRARY``
+  .. versionadded:: 3.25
+
+  Path to the DirectX shader compiler library.
+
+``Vulkan_dxc_EXECUTABLE``
+  .. versionadded:: 3.25
+
+  Path to the DirectX shader compiler CLI tool.
+
+Hints
+^^^^^
+
+.. versionadded:: 3.18
+
+The ``VULKAN_SDK`` environment variable optionally specifies the
+location of the Vulkan SDK root directory for the given
+architecture. It is typically set by sourcing the toplevel
+``setup-env.sh`` script of the Vulkan SDK directory into the shell
+environment.
+
+#]=======================================================================]
+
+cmake_policy(PUSH)
+cmake_policy(SET CMP0057 NEW)
+
+# Provide compatibility with a common invalid component request that
+# was silently ignored prior to CMake 3.24.
+if("FATAL_ERROR" IN_LIST Vulkan_FIND_COMPONENTS)
+  message(AUTHOR_WARNING
+    "Ignoring unknown component 'FATAL_ERROR'.\n"
+    "The find_package() command documents no such argument."
+    )
+  list(REMOVE_ITEM Vulkan_FIND_COMPONENTS "FATAL_ERROR")
+endif()
+
+# For backward compatibility as `FindVulkan` in previous CMake versions allow to retrieve `glslc`
+# and `glslangValidator` without requesting the corresponding component.
+if(NOT glslc IN_LIST Vulkan_FIND_COMPONENTS)
+  list(APPEND Vulkan_FIND_COMPONENTS glslc)
+endif()
+if(NOT glslangValidator IN_LIST Vulkan_FIND_COMPONENTS)
+  list(APPEND Vulkan_FIND_COMPONENTS glslangValidator)
+endif()
+
+if(WIN32)
+  set(_Vulkan_library_name vulkan-1)
+  set(_Vulkan_hint_include_search_paths
+    "$ENV{VULKAN_SDK}/Include"
+  )
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(_Vulkan_hint_executable_search_paths
+      "$ENV{VULKAN_SDK}/Bin"
+    )
+    set(_Vulkan_hint_library_search_paths
+      "$ENV{VULKAN_SDK}/Lib"
+      "$ENV{VULKAN_SDK}/Bin"
+    )
+  else()
+    set(_Vulkan_hint_executable_search_paths
+      "$ENV{VULKAN_SDK}/Bin32"
+    )
+    set(_Vulkan_hint_library_search_paths
+      "$ENV{VULKAN_SDK}/Lib32"
+      "$ENV{VULKAN_SDK}/Bin32"
+    )
+  endif()
+else()
+  set(_Vulkan_library_name vulkan)
+  set(_Vulkan_hint_include_search_paths
+    "$ENV{VULKAN_SDK}/include"
+  )
+  set(_Vulkan_hint_executable_search_paths
+    "$ENV{VULKAN_SDK}/bin"
+  )
+  set(_Vulkan_hint_library_search_paths
+    "$ENV{VULKAN_SDK}/lib"
+  )
+endif()
+if(APPLE AND DEFINED ENV{VULKAN_SDK})
+  cmake_path(SET _MoltenVK_path NORMALIZE "$ENV{VULKAN_SDK}/../MoltenVK")
+  if(EXISTS "${_MoltenVK_path}")
+    list(APPEND _Vulkan_hint_include_search_paths
+      "${_MoltenVK_path}/include"
+    )
+    if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
+      list(APPEND _Vulkan_hint_library_search_paths
+        "${_MoltenVK_path}/dylib/iOS"
+      )
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
+      list(APPEND _Vulkan_hint_library_search_paths
+        "${_MoltenVK_path}/dylib/tvOS"
+      )
+    else()
+      list(APPEND _Vulkan_hint_library_search_paths
+        "${_MoltenVK_path}/dylib/macOS"
+      )
+    endif()
+  endif()
+  unset(_MoltenVK_path)
+endif()
+
+find_path(Vulkan_INCLUDE_DIR
+  NAMES vulkan/vulkan.h
+  HINTS
+    ${_Vulkan_hint_include_search_paths}
+  )
+mark_as_advanced(Vulkan_INCLUDE_DIR)
+
+find_library(Vulkan_LIBRARY
+  NAMES ${_Vulkan_library_name}
+  HINTS
+    ${_Vulkan_hint_library_search_paths}
+  )
+mark_as_advanced(Vulkan_LIBRARY)
+
+if(glslc IN_LIST Vulkan_FIND_COMPONENTS)
+  find_program(Vulkan_GLSLC_EXECUTABLE
+    NAMES glslc
+    HINTS
+      ${_Vulkan_hint_executable_search_paths}
+    )
+  mark_as_advanced(Vulkan_GLSLC_EXECUTABLE)
+endif()
+if(glslangValidator IN_LIST Vulkan_FIND_COMPONENTS)
+  find_program(Vulkan_GLSLANG_VALIDATOR_EXECUTABLE
+    NAMES glslangValidator
+    HINTS
+      ${_Vulkan_hint_executable_search_paths}
+    )
+  mark_as_advanced(Vulkan_GLSLANG_VALIDATOR_EXECUTABLE)
+endif()
+if(glslang IN_LIST Vulkan_FIND_COMPONENTS)
+  find_library(Vulkan_glslang-spirv_LIBRARY
+    NAMES SPIRV
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-spirv_LIBRARY)
+
+  find_library(Vulkan_glslang-spirv_DEBUG_LIBRARY
+    NAMES SPIRVd
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-spirv_DEBUG_LIBRARY)
+
+  find_library(Vulkan_glslang-oglcompiler_LIBRARY
+    NAMES OGLCompiler
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-oglcompiler_LIBRARY)
+
+  find_library(Vulkan_glslang-oglcompiler_DEBUG_LIBRARY
+    NAMES OGLCompilerd
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-oglcompiler_DEBUG_LIBRARY)
+
+  find_library(Vulkan_glslang-osdependent_LIBRARY
+    NAMES OSDependent
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-osdependent_LIBRARY)
+
+  find_library(Vulkan_glslang-osdependent_DEBUG_LIBRARY
+    NAMES OSDependentd
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-osdependent_DEBUG_LIBRARY)
+
+  find_library(Vulkan_glslang-machineindependent_LIBRARY
+    NAMES MachineIndependent
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-machineindependent_LIBRARY)
+
+  find_library(Vulkan_glslang-machineindependent_DEBUG_LIBRARY
+    NAMES MachineIndependentd
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-machineindependent_DEBUG_LIBRARY)
+
+  find_library(Vulkan_glslang-genericcodegen_LIBRARY
+    NAMES GenericCodeGen
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-genericcodegen_LIBRARY)
+
+  find_library(Vulkan_glslang-genericcodegen_DEBUG_LIBRARY
+    NAMES GenericCodeGend
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang-genericcodegen_DEBUG_LIBRARY)
+
+  find_library(Vulkan_glslang_LIBRARY
+    NAMES glslang
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang_LIBRARY)
+
+  find_library(Vulkan_glslang_DEBUG_LIBRARY
+    NAMES glslangd
+    HINTS
+      ${_Vulkan_hint_library_search_paths}
+    )
+  mark_as_advanced(Vulkan_glslang_DEBUG_LIBRARY)
+endif()
+if(shaderc_combined IN_LIST Vulkan_FIND_COMPONENTS)
+  find_library(Vulkan_shaderc_combined_LIBRARY
+    NAMES shaderc_combined
+    HINTS
+    ${_Vulkan_hint_library_search_paths})
+  mark_as_advanced(Vulkan_shaderc_combined_LIBRARY)
+
+  find_library(Vulkan_shaderc_combined_DEBUG_LIBRARY
+    NAMES shaderc_combinedd
+    HINTS
+    ${_Vulkan_hint_library_search_paths})
+  mark_as_advanced(Vulkan_shaderc_combined_DEBUG_LIBRARY)
+endif()
+if(SPIRV-Tools IN_LIST Vulkan_FIND_COMPONENTS)
+  find_library(Vulkan_SPIRV-Tools_LIBRARY
+    NAMES SPIRV-Tools
+    HINTS
+      ${_Vulkan_hint_library_search_paths})
+  mark_as_advanced(Vulkan_SPIRV-Tools_LIBRARY)
+
+  find_library(Vulkan_SPIRV-Tools_DEBUG_LIBRARY
+    NAMES SPIRV-Toolsd
+    HINTS
+      ${_Vulkan_hint_library_search_paths})
+  mark_as_advanced(Vulkan_SPIRV-Tools_DEBUG_LIBRARY)
+endif()
+if(MoltenVK IN_LIST Vulkan_FIND_COMPONENTS)
+  find_library(Vulkan_MoltenVK_LIBRARY
+    NAMES MoltenVK
+    HINTS
+      ${_Vulkan_hint_library_search_paths})
+  mark_as_advanced(Vulkan_MoltenVK_LIBRARY)
+
+  find_path(Vulkan_MoltenVK_INCLUDE_DIR
+    NAMES MoltenVK/mvk_vulkan.h
+    HINTS
+      ${_Vulkan_hint_include_search_paths}
+    )
+  mark_as_advanced(Vulkan_MoltenVK_INCLUDE_DIR)
+endif()
+if(volk IN_LIST Vulkan_FIND_COMPONENTS)
+  find_library(Vulkan_volk_LIBRARY
+          NAMES volk
+          HINTS
+            ${_Vulkan_hint_library_search_paths})
+  mark_as_advanced(Vulkan_Volk_LIBRARY)
+endif()
+
+if (dxc IN_LIST Vulkan_FIND_COMPONENTS)
+  find_library(Vulkan_dxc_LIBRARY
+          NAMES dxcompiler
+          HINTS
+            ${_Vulkan_hint_library_search_paths})
+  mark_as_advanced(Vulkan_dxc_LIBRARY)
+
+  find_program(Vulkan_dxc_EXECUTABLE
+          NAMES dxc
+          HINTS
+            ${_Vulkan_hint_executable_search_paths})
+  mark_as_advanced(Vulkan_dxc_EXECUTABLE)
+endif()
+
+if(Vulkan_GLSLC_EXECUTABLE)
+  set(Vulkan_glslc_FOUND TRUE)
+else()
+  set(Vulkan_glslc_FOUND FALSE)
+endif()
+
+if(Vulkan_GLSLANG_VALIDATOR_EXECUTABLE)
+  set(Vulkan_glslangValidator_FOUND TRUE)
+else()
+  set(Vulkan_glslangValidator_FOUND FALSE)
+endif()
+
+if (Vulkan_dxc_EXECUTABLE)
+  set(Vulkan_dxc_exe_FOUND TRUE)
+else()
+  set(Vulkan_dxc_exe_FOUND FALSE)
+endif()
+
+function(_Vulkan_set_library_component_found component)
+  cmake_parse_arguments(PARSE_ARGV 1 _ARG
+    "NO_WARNING"
+    ""
+    "DEPENDENT_COMPONENTS")
+
+  set(all_dependent_component_found TRUE)
+  foreach(dependent_component IN LISTS _ARG_DEPENDENT_COMPONENTS)
+    if(NOT Vulkan_${dependent_component}_FOUND)
+      set(all_dependent_component_found FALSE)
+      break()
+    endif()
+  endforeach()
+
+  if(all_dependent_component_found AND (Vulkan_${component}_LIBRARY OR Vulkan_${component}_DEBUG_LIBRARY))
+    set(Vulkan_${component}_FOUND TRUE PARENT_SCOPE)
+
+    # For Windows Vulkan SDK, third party tools binaries are provided with different MSVC ABI:
+    #   - Release binaries uses a runtime library
+    #   - Debug binaries uses a debug runtime library
+    # This lead to incompatibilities in linking for some configuration types due to CMake-default or project-configured selected MSVC ABI.
+    if(WIN32 AND NOT _ARG_NO_WARNING)
+      if(NOT Vulkan_${component}_LIBRARY)
+        message(WARNING
+"Library ${component} for Release configuration is missing, imported target Vulkan::${component} may not be able to link when targeting this build configuration due to incompatible MSVC ABI.")
+      endif()
+      if(NOT Vulkan_${component}_DEBUG_LIBRARY)
+        message(WARNING
+"Library ${component} for Debug configuration is missing, imported target Vulkan::${component} may not be able to link when targeting this build configuration due to incompatible MSVC ABI. Consider re-installing the Vulkan SDK and request debug libraries to fix this warning.")
+      endif()
+    endif()
+  else()
+    set(Vulkan_${component}_FOUND FALSE PARENT_SCOPE)
+  endif()
+endfunction()
+
+_Vulkan_set_library_component_found(glslang-spirv NO_WARNING)
+_Vulkan_set_library_component_found(glslang-oglcompiler NO_WARNING)
+_Vulkan_set_library_component_found(glslang-osdependent NO_WARNING)
+_Vulkan_set_library_component_found(glslang-machineindependent NO_WARNING)
+_Vulkan_set_library_component_found(glslang-genericcodegen NO_WARNING)
+_Vulkan_set_library_component_found(glslang
+  DEPENDENT_COMPONENTS
+    glslang-spirv
+    glslang-oglcompiler
+    glslang-osdependent
+    glslang-machineindependent
+    glslang-genericcodegen)
+_Vulkan_set_library_component_found(shaderc_combined)
+_Vulkan_set_library_component_found(SPIRV-Tools)
+_Vulkan_set_library_component_found(volk)
+_Vulkan_set_library_component_found(dxc)
+
+if(Vulkan_MoltenVK_INCLUDE_DIR AND Vulkan_MoltenVK_LIBRARY)
+  set(Vulkan_MoltenVK_FOUND TRUE)
+else()
+  set(Vulkan_MoltenVK_FOUND FALSE)
+endif()
+
+set(Vulkan_LIBRARIES ${Vulkan_LIBRARY})
+set(Vulkan_INCLUDE_DIRS ${Vulkan_INCLUDE_DIR})
+
+# detect version e.g 1.2.189
+set(Vulkan_VERSION "")
+if(Vulkan_INCLUDE_DIR)
+  set(VULKAN_CORE_H ${Vulkan_INCLUDE_DIR}/vulkan/vulkan_core.h)
+  if(EXISTS ${VULKAN_CORE_H})
+    file(STRINGS  ${VULKAN_CORE_H} VulkanHeaderVersionLine REGEX "^#define VK_HEADER_VERSION ")
+    string(REGEX MATCHALL "[0-9]+" VulkanHeaderVersion "${VulkanHeaderVersionLine}")
+    file(STRINGS  ${VULKAN_CORE_H} VulkanHeaderVersionLine2 REGEX "^#define VK_HEADER_VERSION_COMPLETE ")
+    string(REGEX MATCHALL "[0-9]+" VulkanHeaderVersion2 "${VulkanHeaderVersionLine2}")
+    list(LENGTH VulkanHeaderVersion2 _len)
+    #  versions >= 1.2.175 have an additional numbers in front of e.g. '0, 1, 2' instead of '1, 2'
+    if(_len EQUAL 3)
+        list(REMOVE_AT VulkanHeaderVersion2 0)
+    endif()
+    list(APPEND VulkanHeaderVersion2 ${VulkanHeaderVersion})
+    list(JOIN VulkanHeaderVersion2 "." Vulkan_VERSION)
+  endif()
+endif()
+
+if(Vulkan_MoltenVK_FOUND)
+  set(Vulkan_MoltenVK_VERSION "")
+  if(Vulkan_MoltenVK_INCLUDE_DIR)
+    set(VK_MVK_MOLTENVK_H ${Vulkan_MoltenVK_INCLUDE_DIR}/MoltenVK/vk_mvk_moltenvk.h)
+    if(EXISTS ${VK_MVK_MOLTENVK_H})
+      file(STRINGS  ${VK_MVK_MOLTENVK_H} _Vulkan_MoltenVK_VERSION_MAJOR REGEX "^#define MVK_VERSION_MAJOR ")
+      string(REGEX MATCHALL "[0-9]+" _Vulkan_MoltenVK_VERSION_MAJOR "${_Vulkan_MoltenVK_VERSION_MAJOR}")
+      file(STRINGS  ${VK_MVK_MOLTENVK_H} _Vulkan_MoltenVK_VERSION_MINOR REGEX "^#define MVK_VERSION_MINOR ")
+      string(REGEX MATCHALL "[0-9]+" _Vulkan_MoltenVK_VERSION_MINOR "${_Vulkan_MoltenVK_VERSION_MINOR}")
+      file(STRINGS  ${VK_MVK_MOLTENVK_H} _Vulkan_MoltenVK_VERSION_PATCH REGEX "^#define MVK_VERSION_PATCH ")
+      string(REGEX MATCHALL "[0-9]+" _Vulkan_MoltenVK_VERSION_PATCH "${_Vulkan_MoltenVK_VERSION_PATCH}")
+      set(Vulkan_MoltenVK_VERSION "${_Vulkan_MoltenVK_VERSION_MAJOR}.${_Vulkan_MoltenVK_VERSION_MINOR}.${_Vulkan_MoltenVK_VERSION_PATCH}")
+      unset(_Vulkan_MoltenVK_VERSION_MAJOR)
+      unset(_Vulkan_MoltenVK_VERSION_MINOR)
+      unset(_Vulkan_MoltenVK_VERSION_PATCH)
+    endif()
+  endif()
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(Vulkan
+  REQUIRED_VARS
+    Vulkan_LIBRARY
+    Vulkan_INCLUDE_DIR
+  VERSION_VAR
+    Vulkan_VERSION
+  HANDLE_COMPONENTS
+)
+
+if(Vulkan_FOUND AND NOT TARGET Vulkan::Vulkan)
+  add_library(Vulkan::Vulkan UNKNOWN IMPORTED)
+  set_target_properties(Vulkan::Vulkan PROPERTIES
+    IMPORTED_LOCATION "${Vulkan_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+endif()
+
+if(Vulkan_FOUND AND NOT TARGET Vulkan::Headers)
+  add_library(Vulkan::Headers INTERFACE IMPORTED)
+  set_target_properties(Vulkan::Headers PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+endif()
+
+if(Vulkan_FOUND AND Vulkan_GLSLC_EXECUTABLE AND NOT TARGET Vulkan::glslc)
+  add_executable(Vulkan::glslc IMPORTED)
+  set_property(TARGET Vulkan::glslc PROPERTY IMPORTED_LOCATION "${Vulkan_GLSLC_EXECUTABLE}")
+endif()
+
+if(Vulkan_FOUND AND Vulkan_GLSLANG_VALIDATOR_EXECUTABLE AND NOT TARGET Vulkan::glslangValidator)
+  add_executable(Vulkan::glslangValidator IMPORTED)
+  set_property(TARGET Vulkan::glslangValidator PROPERTY IMPORTED_LOCATION "${Vulkan_GLSLANG_VALIDATOR_EXECUTABLE}")
+endif()
+
+if(Vulkan_FOUND)
+  if((Vulkan_glslang-spirv_LIBRARY OR Vulkan_glslang-spirv_DEBUG_LIBRARY) AND NOT TARGET Vulkan::glslang-spirv)
+    add_library(Vulkan::glslang-spirv STATIC IMPORTED)
+    set_property(TARGET Vulkan::glslang-spirv
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_glslang-spirv_LIBRARY)
+      set_property(TARGET Vulkan::glslang-spirv APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::glslang-spirv
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_glslang-spirv_LIBRARY}")
+    endif()
+    if(Vulkan_glslang-spirv_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::glslang-spirv APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::glslang-spirv
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_glslang-spirv_DEBUG_LIBRARY}")
+    endif()
+  endif()
+
+  if((Vulkan_glslang-oglcompiler_LIBRARY OR Vulkan_glslang-oglcompiler_DEBUG_LIBRARY) AND NOT TARGET Vulkan::glslang-oglcompiler)
+    add_library(Vulkan::glslang-oglcompiler STATIC IMPORTED)
+    set_property(TARGET Vulkan::glslang-oglcompiler
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_glslang-oglcompiler_LIBRARY)
+      set_property(TARGET Vulkan::glslang-oglcompiler APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::glslang-oglcompiler
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_glslang-oglcompiler_LIBRARY}")
+    endif()
+    if(Vulkan_glslang-oglcompiler_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::glslang-oglcompiler APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::glslang-oglcompiler
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_glslang-oglcompiler_DEBUG_LIBRARY}")
+    endif()
+  endif()
+
+  if((Vulkan_glslang-osdependent_LIBRARY OR Vulkan_glslang-osdependent_DEBUG_LIBRARY) AND NOT TARGET Vulkan::glslang-osdependent)
+    add_library(Vulkan::glslang-osdependent STATIC IMPORTED)
+    set_property(TARGET Vulkan::glslang-osdependent
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_glslang-osdependent_LIBRARY)
+      set_property(TARGET Vulkan::glslang-osdependent APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::glslang-osdependent
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_glslang-osdependent_LIBRARY}")
+    endif()
+    if(Vulkan_glslang-osdependent_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::glslang-osdependent APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::glslang-osdependent
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_glslang-osdependent_DEBUG_LIBRARY}")
+    endif()
+  endif()
+
+  if((Vulkan_glslang-machineindependent_LIBRARY OR Vulkan_glslang-machineindependent_DEBUG_LIBRARY) AND NOT TARGET Vulkan::glslang-machineindependent)
+    add_library(Vulkan::glslang-machineindependent STATIC IMPORTED)
+    set_property(TARGET Vulkan::glslang-machineindependent
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_glslang-machineindependent_LIBRARY)
+      set_property(TARGET Vulkan::glslang-machineindependent APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::glslang-machineindependent
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_glslang-machineindependent_LIBRARY}")
+    endif()
+    if(Vulkan_glslang-machineindependent_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::glslang-machineindependent APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::glslang-machineindependent
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_glslang-machineindependent_DEBUG_LIBRARY}")
+    endif()
+  endif()
+
+  if((Vulkan_glslang-genericcodegen_LIBRARY OR Vulkan_glslang-genericcodegen_DEBUG_LIBRARY) AND NOT TARGET Vulkan::glslang-genericcodegen)
+    add_library(Vulkan::glslang-genericcodegen STATIC IMPORTED)
+    set_property(TARGET Vulkan::glslang-genericcodegen
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_glslang-genericcodegen_LIBRARY)
+      set_property(TARGET Vulkan::glslang-genericcodegen APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::glslang-genericcodegen
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_glslang-genericcodegen_LIBRARY}")
+    endif()
+    if(Vulkan_glslang-genericcodegen_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::glslang-genericcodegen APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::glslang-genericcodegen
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_glslang-genericcodegen_DEBUG_LIBRARY}")
+    endif()
+  endif()
+
+  if((Vulkan_glslang_LIBRARY OR Vulkan_glslang_DEBUG_LIBRARY)
+      AND TARGET Vulkan::glslang-spirv
+      AND TARGET Vulkan::glslang-oglcompiler
+      AND TARGET Vulkan::glslang-osdependent
+      AND TARGET Vulkan::glslang-machineindependent
+      AND TARGET Vulkan::glslang-genericcodegen
+      AND NOT TARGET Vulkan::glslang)
+    add_library(Vulkan::glslang STATIC IMPORTED)
+    set_property(TARGET Vulkan::glslang
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_glslang_LIBRARY)
+      set_property(TARGET Vulkan::glslang APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::glslang
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_glslang_LIBRARY}")
+    endif()
+    if(Vulkan_glslang_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::glslang APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::glslang
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_glslang_DEBUG_LIBRARY}")
+    endif()
+    target_link_libraries(Vulkan::glslang
+      INTERFACE
+        Vulkan::glslang-spirv
+        Vulkan::glslang-oglcompiler
+        Vulkan::glslang-osdependent
+        Vulkan::glslang-machineindependent
+        Vulkan::glslang-genericcodegen
+    )
+  endif()
+
+  if((Vulkan_shaderc_combined_LIBRARY OR Vulkan_shaderc_combined_DEBUG_LIBRARY) AND NOT TARGET Vulkan::shaderc_combined)
+    add_library(Vulkan::shaderc_combined STATIC IMPORTED)
+    set_property(TARGET Vulkan::shaderc_combined
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_shaderc_combined_LIBRARY)
+      set_property(TARGET Vulkan::shaderc_combined APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::shaderc_combined
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_shaderc_combined_LIBRARY}")
+    endif()
+    if(Vulkan_shaderc_combined_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::shaderc_combined APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::shaderc_combined
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_shaderc_combined_DEBUG_LIBRARY}")
+    endif()
+
+    if(UNIX)
+      find_package(Threads REQUIRED)
+      target_link_libraries(Vulkan::shaderc_combined
+        INTERFACE
+          Threads::Threads)
+    endif()
+  endif()
+
+  if((Vulkan_SPIRV-Tools_LIBRARY OR Vulkan_SPIRV-Tools_DEBUG_LIBRARY) AND NOT TARGET Vulkan::SPIRV-Tools)
+    add_library(Vulkan::SPIRV-Tools STATIC IMPORTED)
+    set_property(TARGET Vulkan::SPIRV-Tools
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    if(Vulkan_SPIRV-Tools_LIBRARY)
+      set_property(TARGET Vulkan::SPIRV-Tools APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Release)
+      set_property(TARGET Vulkan::SPIRV-Tools
+        PROPERTY
+          IMPORTED_LOCATION_RELEASE "${Vulkan_SPIRV-Tools_LIBRARY}")
+    endif()
+    if(Vulkan_SPIRV-Tools_DEBUG_LIBRARY)
+      set_property(TARGET Vulkan::SPIRV-Tools APPEND
+        PROPERTY
+          IMPORTED_CONFIGURATIONS Debug)
+      set_property(TARGET Vulkan::SPIRV-Tools
+        PROPERTY
+          IMPORTED_LOCATION_DEBUG "${Vulkan_SPIRV-Tools_DEBUG_LIBRARY}")
+    endif()
+  endif()
+
+  if(Vulkan_volk_LIBRARY AND NOT TARGET Vulkan::volk)
+    add_library(Vulkan::volk STATIC IMPORTED)
+    set_property(TARGET Vulkan::volk
+            PROPERTY
+              INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    set_property(TARGET Vulkan::volk APPEND
+            PROPERTY
+              IMPORTED_CONFIGURATIONS Release)
+    set_property(TARGET Vulkan::volk APPEND
+            PROPERTY
+              IMPORTED_LOCATION_RELEASE "${Vulkan_volk_LIBRARY}")
+
+    if (NOT WIN32)
+      set_property(TARGET Vulkan::volk APPEND
+              PROPERTY
+                IMPORTED_LINK_INTERFACE_LIBRARIES dl)
+    endif()
+  endif()
+
+  if (Vulkan_dxc_LIBRARY AND NOT TARGET Vulkan::dxc_lib)
+    add_library(Vulkan::dxc_lib STATIC IMPORTED)
+    set_property(TARGET Vulkan::dxc_lib
+      PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_INCLUDE_DIRS}")
+    set_property(TARGET Vulkan::dxc_lib APPEND
+      PROPERTY
+        IMPORTED_CONFIGURATIONS Release)
+    set_property(TARGET Vulkan::dxc_lib APPEND
+      PROPERTY
+        IMPORTED_LOCATION_RELEASE "${Vulkan_dxc_LIBRARY}")
+  endif()
+
+  if(Vulkan_dxc_EXECUTABLE AND NOT TARGET Vulkan::dxc_exe)
+    add_executable(Vulkan::dxc_exe IMPORTED)
+    set_property(TARGET Vulkan::dxc_exe PROPERTY IMPORTED_LOCATION "${Vulkan_dxc_EXECUTABLE}")
+  endif()
+
+endif()
+
+if(Vulkan_MoltenVK_FOUND)
+  if(Vulkan_MoltenVK_LIBRARY AND NOT TARGET Vulkan::MoltenVK)
+    add_library(Vulkan::MoltenVK SHARED IMPORTED)
+    set_target_properties(Vulkan::MoltenVK
+      PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${Vulkan_MoltenVK_INCLUDE_DIR}"
+        IMPORTED_LOCATION "${Vulkan_MoltenVK_LIBRARY}"
+    )
+  endif()
+endif()
+
+unset(_Vulkan_library_name)
+unset(_Vulkan_hint_include_search_paths)
+unset(_Vulkan_hint_executable_search_paths)
+unset(_Vulkan_hint_library_search_paths)
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindWget.cmake b/deps/cmake/share/cmake-3.25/Modules/FindWget.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindWget.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindWget.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindWish.cmake b/deps/cmake/share/cmake-3.25/Modules/FindWish.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindWish.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindWish.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindX11.cmake b/deps/cmake/share/cmake-3.25/Modules/FindX11.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/FindX11.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindX11.cmake
index d480fc48..8e5a5f17 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindX11.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindX11.cmake
@@ -31,8 +31,11 @@ and also the following more fine grained variables and targets:
   X11_xcb_INCLUDE_PATH,          X11_xcb_LIB,        X11_xcb_FOUND,        X11::xcb
   X11_X11_xcb_INCLUDE_PATH,      X11_X11_xcb_LIB,    X11_X11_xcb_FOUND,    X11::X11_xcb
   X11_xcb_icccm_INCLUDE_PATH,    X11_xcb_icccm_LIB,  X11_xcb_icccm_FOUND,  X11::xcb_icccm
+  X11_xcb_randr_INCLUDE_PATH,    X11_xcb_randr_LIB,  X11_xcb_randr_FOUND,  X11::xcb_randr
   X11_xcb_util_INCLUDE_PATH,     X11_xcb_util_LIB,   X11_xcb_util_FOUND,   X11::xcb_util
   X11_xcb_xfixes_INCLUDE_PATH,   X11_xcb_xfixes_LIB, X11_xcb_xfixes_FOUND, X11::xcb_xfixes
+  X11_xcb_xtest_INCLUDE_PATH,    X11_xcb_xtest_LIB,  X11_xcb_xtest_FOUND,  X11::xcb_xtest
+  X11_xcb_keysyms_INCLUDE_PATH,  X11_xcb_keysyms_LIB,X11_xcb_keysyms_FOUND,X11::xcb_keysyms
   X11_xcb_xkb_INCLUDE_PATH,      X11_xcb_xkb_LIB,    X11_xcb_xkb_FOUND,    X11::xcb_xkb
   X11_Xcomposite_INCLUDE_PATH,   X11_Xcomposite_LIB, X11_Xcomposite_FOUND, X11::Xcomposite
   X11_Xcursor_INCLUDE_PATH,      X11_Xcursor_LIB,    X11_Xcursor_FOUND,    X11::Xcursor
@@ -82,6 +85,9 @@ and also the following more fine grained variables and targets:
 .. versionadded:: 3.19
   Added the ``Xaw``, ``xcb_util``, and ``xcb_xfixes`` libraries.
 
+.. versionadded:: 3.24
+  Added the ``xcb_randr``, ``xcb_xtext``, and ``xcb_keysyms`` libraries.
+
 #]=======================================================================]
 
 if (UNIX)
@@ -127,8 +133,11 @@ if (UNIX)
   find_path(X11_xcb_INCLUDE_PATH xcb/xcb.h                           ${X11_INC_SEARCH_PATH})
   find_path(X11_X11_xcb_INCLUDE_PATH X11/Xlib-xcb.h                  ${X11_INC_SEARCH_PATH})
   find_path(X11_xcb_icccm_INCLUDE_PATH xcb/xcb_icccm.h               ${X11_INC_SEARCH_PATH})
+  find_path(X11_xcb_randr_INCLUDE_PATH xcb/randr.h                   ${X11_INC_SEARCH_PATH})
   find_path(X11_xcb_util_INCLUDE_PATH xcb/xcb_aux.h                  ${X11_INC_SEARCH_PATH})
   find_path(X11_xcb_xfixes_INCLUDE_PATH xcb/xfixes.h                 ${X11_INC_SEARCH_PATH})
+  find_path(X11_xcb_xtest_INCLUDE_PATH xcb/xtest.h                   ${X11_INC_SEARCH_PATH})
+  find_path(X11_xcb_keysyms_INCLUDE_PATH xcb/xcb_keysyms.h           ${X11_INC_SEARCH_PATH})
   find_path(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h  ${X11_INC_SEARCH_PATH})
   find_path(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h           ${X11_INC_SEARCH_PATH})
   find_path(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h        ${X11_INC_SEARCH_PATH})
@@ -180,8 +189,11 @@ if (UNIX)
   find_library(X11_xcb_LIB xcb               ${X11_LIB_SEARCH_PATH})
   find_library(X11_X11_xcb_LIB X11-xcb       ${X11_LIB_SEARCH_PATH})
   find_library(X11_xcb_icccm_LIB xcb-icccm   ${X11_LIB_SEARCH_PATH})
+  find_library(X11_xcb_randr_LIB xcb-randr   ${X11_LIB_SEARCH_PATH})
   find_library(X11_xcb_util_LIB xcb-util     ${X11_LIB_SEARCH_PATH})
   find_library(X11_xcb_xfixes_LIB xcb-xfixes ${X11_LIB_SEARCH_PATH})
+  find_library(X11_xcb_xtest_LIB xcb-xtest   ${X11_LIB_SEARCH_PATH})
+  find_library(X11_xcb_keysyms_LIB xcb-keysyms ${X11_LIB_SEARCH_PATH})
   find_library(X11_xcb_xkb_LIB xcb-xkb       ${X11_LIB_SEARCH_PATH})
   find_library(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
   find_library(X11_Xcursor_LIB Xcursor       ${X11_LIB_SEARCH_PATH})
@@ -281,6 +293,10 @@ if (UNIX)
     set(X11_xcb_icccm_FOUND TRUE)
   endif ()
 
+  if (X11_xcb_randr_LIB AND X11_xcb_randr_INCLUDE_PATH)
+    set(X11_xcb_randr_FOUND TRUE)
+  endif ()
+
   if (X11_xcb_util_LIB AND X11_xcb_util_INCLUDE_PATH)
     set(X11_xcb_util_FOUND TRUE)
   endif ()
@@ -289,6 +305,14 @@ if (UNIX)
     set(X11_xcb_xfixes_FOUND TRUE)
   endif ()
 
+  if (X11_xcb_xtest_LIB)
+    set(X11_xcb_xtest_FOUND TRUE)
+  endif ()
+
+  if (X11_xcb_keysyms_LIB)
+    set(X11_xcb_keysyms_FOUND TRUE)
+  endif ()
+
   if (X11_xcb_xkb_LIB)
     set(X11_xcb_xkb_FOUND TRUE)
   endif ()
@@ -600,6 +624,13 @@ if (UNIX)
       INTERFACE_LINK_LIBRARIES "X11::xcb")
   endif ()
 
+  if (X11_xcb_randr_FOUND AND NOT TARGET X11::xcb_randr)
+    add_library(X11::xcb_randr UNKNOWN IMPORTED)
+    set_target_properties(X11::xcb_randr PROPERTIES
+      IMPORTED_LOCATION "${X11_xcb_randr_LIB}"
+      INTERFACE_LINK_LIBRARIES "X11::xcb")
+  endif ()
+
   if (X11_xcb_util_FOUND AND NOT TARGET X11::xcb_util)
     add_library(X11::xcb_util UNKNOWN IMPORTED)
     set_target_properties(X11::xcb_util PROPERTIES
@@ -614,6 +645,20 @@ if (UNIX)
       INTERFACE_LINK_LIBRARIES "X11::xcb")
   endif ()
 
+  if (X11_xcb_xtest_FOUND AND NOT TARGET X11::xcb_xtest)
+  add_library(X11::xcb_xtest UNKNOWN IMPORTED)
+  set_target_properties(X11::xcb_xtest PROPERTIES
+    IMPORTED_LOCATION "${X11_xcb_xtest_LIB}"
+    INTERFACE_LINK_LIBRARIES "X11::xcb")
+  endif ()
+
+  if (X11_xcb_keysyms_FOUND AND NOT TARGET X11::xcb_keysyms)
+    add_library(X11::xcb_keysyms UNKNOWN IMPORTED)
+    set_target_properties(X11::xcb_keysyms PROPERTIES
+      IMPORTED_LOCATION "${X11_xcb_keysyms_LIB}"
+      INTERFACE_LINK_LIBRARIES "X11::xcb")
+  endif ()
+
   if (X11_xcb_xkb_FOUND AND NOT TARGET X11::xcb_xkb)
     add_library(X11::xcb_xkb UNKNOWN IMPORTED)
     set_target_properties(X11::xcb_xkb PROPERTIES
@@ -828,6 +873,18 @@ if (UNIX)
     X11_Xau_INCLUDE_PATH
     X11_xcb_LIB
     X11_xcb_INCLUDE_PATH
+    X11_xcb_icccm_LIB
+    X11_xcb_icccm_INCLUDE_PATH
+    X11_xcb_randr_LIB
+    X11_xcb_randr_INCLUDE_PATH
+    X11_xcb_util_LIB
+    X11_xcb_util_INCLUDE_PATH
+    X11_xcb_xfixes_LIB
+    X11_xcb_xfixes_INCLUDE_PATH
+    X11_xcb_xtest_LIB
+    X11_xcb_xtest_INCLUDE_PATH
+    X11_xcb_keysyms_LIB
+    X11_xcb_keysyms_INCLUDE_PATH
     X11_xcb_xkb_LIB
     X11_X11_xcb_LIB
     X11_X11_xcb_INCLUDE_PATH
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindXCTest.cmake b/deps/cmake/share/cmake-3.25/Modules/FindXCTest.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindXCTest.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindXCTest.cmake
index 00729bc2..7118df20 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindXCTest.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindXCTest.cmake
@@ -13,7 +13,7 @@ An XCTest bundle is a CFBundle with a special product-type
 and bundle extension. The Mac Developer Library provides more
 information in the `Testing with Xcode`_ document.
 
-.. _Testing with Xcode: http://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/testing_with_xcode/
+.. _Testing with Xcode: https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/testing_with_xcode/
 
 Module Functions
 ^^^^^^^^^^^^^^^^
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindXMLRPC.cmake b/deps/cmake/share/cmake-3.25/Modules/FindXMLRPC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindXMLRPC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindXMLRPC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindXalanC.cmake b/deps/cmake/share/cmake-3.25/Modules/FindXalanC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindXalanC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindXalanC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindXercesC.cmake b/deps/cmake/share/cmake-3.25/Modules/FindXercesC.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/FindXercesC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindXercesC.cmake
index af1b0b43..d39bbf6a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindXercesC.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindXercesC.cmake
@@ -91,11 +91,13 @@ if(NOT XercesC_LIBRARY)
                NAMES "xerces-c"
                      "xerces-c_${XercesC_VERSION_MAJOR}"
                      "xerces-c-${XercesC_VERSION_MAJOR}.${XercesC_VERSION_MINOR}"
+               NAMES_PER_DIR
                DOC "Xerces-C++ libraries (release)")
   find_library(XercesC_LIBRARY_DEBUG
                NAMES "xerces-cd"
                      "xerces-c_${XercesC_VERSION_MAJOR}D"
                      "xerces-c_${XercesC_VERSION_MAJOR}_${XercesC_VERSION_MINOR}D"
+               NAMES_PER_DIR
                DOC "Xerces-C++ libraries (debug)")
   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
   select_library_configurations(XercesC)
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindZLIB.cmake b/deps/cmake/share/cmake-3.25/Modules/FindZLIB.cmake
similarity index 74%
rename from deps/cmake/share/cmake-3.21/Modules/FindZLIB.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindZLIB.cmake
index 5778b031..be5c775b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindZLIB.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindZLIB.cmake
@@ -53,6 +53,11 @@ Hints
 
 A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
 module where to look.
+
+.. versionadded:: 3.24
+  Set ``ZLIB_USE_STATIC_LIBS`` to ``ON`` to look for static libraries.
+  Default is ``OFF``.
+
 #]=======================================================================]
 
 set(_ZLIB_SEARCHES)
@@ -72,8 +77,13 @@ set(_ZLIB_SEARCH_NORMAL
 unset(_ZLIB_x86)
 list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
 
-set(ZLIB_NAMES z zlib zdll zlib1 zlibstatic)
-set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd)
+if(ZLIB_USE_STATIC_LIBS)
+  set(ZLIB_NAMES zlibstatic zlibstat zlib z)
+  set(ZLIB_NAMES_DEBUG zlibstaticd zlibstatd zlibd zd)
+else()
+  set(ZLIB_NAMES z zlib zdll zlib1 zlibstatic zlibwapi zlibvc zlibstat)
+  set(ZLIB_NAMES_DEBUG zd zlibd zdlld zlibd1 zlib1d zlibstaticd zlibwapid zlibvcd zlibstatd)
+endif()
 
 # Try each search configuration.
 foreach(search ${_ZLIB_SEARCHES})
@@ -82,11 +92,47 @@ endforeach()
 
 # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
 if(NOT ZLIB_LIBRARY)
+  if(DEFINED CMAKE_FIND_LIBRARY_PREFIXES)
+    set(_zlib_ORIG_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
+  else()
+    set(_zlib_ORIG_CMAKE_FIND_LIBRARY_PREFIXES)
+  endif()
+  if(DEFINED CMAKE_FIND_LIBRARY_SUFFIXES)
+    set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES}")
+  else()
+    set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
+  endif()
+  # Prefix/suffix of the win32/Makefile.gcc build
+  if(WIN32)
+    list(APPEND CMAKE_FIND_LIBRARY_PREFIXES "" "lib")
+    list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a")
+  endif()
+  # Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
+  if(ZLIB_USE_STATIC_LIBS)
+    if(WIN32)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    else()
+      set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+    endif()
+  endif()
+
   foreach(search ${_ZLIB_SEARCHES})
     find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
     find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
   endforeach()
 
+  # Restore the original find library ordering
+  if(DEFINED _zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES "${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}")
+  else()
+    set(CMAKE_FIND_LIBRARY_SUFFIXES)
+  endif()
+  if(DEFINED _zlib_ORIG_CMAKE_FIND_LIBRARY_PREFIXES)
+    set(CMAKE_FIND_LIBRARY_PREFIXES "${_zlib_ORIG_CMAKE_FIND_LIBRARY_PREFIXES}")
+  else()
+    set(CMAKE_FIND_LIBRARY_PREFIXES)
+  endif()
+
   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
   select_library_configurations(ZLIB)
 endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Findosg.cmake b/deps/cmake/share/cmake-3.25/Modules/Findosg.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Findosg.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Findosg.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgAnimation.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgAnimation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgAnimation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgAnimation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgDB.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgDB.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgDB.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgDB.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgFX.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgFX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgFX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgFX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgGA.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgGA.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgGA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgGA.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgIntrospection.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgIntrospection.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgIntrospection.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgIntrospection.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgManipulator.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgManipulator.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgManipulator.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgManipulator.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgParticle.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgParticle.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgParticle.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgParticle.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgPresentation.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgPresentation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgPresentation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgPresentation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgProducer.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgProducer.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgProducer.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgProducer.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgQt.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgQt.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgQt.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgQt.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgShadow.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgShadow.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgShadow.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgShadow.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgSim.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgSim.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgSim.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgSim.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgTerrain.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgTerrain.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgTerrain.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgTerrain.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgText.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgText.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgText.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgText.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgUtil.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgUtil.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgUtil.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgUtil.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgViewer.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgViewer.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgViewer.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgViewer.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgVolume.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgVolume.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgVolume.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgVolume.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindosgWidget.cmake b/deps/cmake/share/cmake-3.25/Modules/FindosgWidget.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FindosgWidget.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindosgWidget.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Findosg_functions.cmake b/deps/cmake/share/cmake-3.25/Modules/Findosg_functions.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Findosg_functions.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Findosg_functions.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindwxWidgets.cmake b/deps/cmake/share/cmake-3.25/Modules/FindwxWidgets.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/FindwxWidgets.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindwxWidgets.cmake
index 63af9b68..19eba957 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindwxWidgets.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindwxWidgets.cmake
@@ -29,9 +29,9 @@ select a configuration):
 ::
 
   wxWidgets_ROOT_DIR      - Base wxWidgets directory
-                            (e.g., C:/wxWidgets-2.6.3).
+                            (e.g., C:/wxWidgets-3.2.0).
   wxWidgets_LIB_DIR       - Path to wxWidgets libraries
-                            (e.g., C:/wxWidgets-2.6.3/lib/vc_lib).
+                            (e.g., C:/wxWidgets-3.2.0/lib/vc_x64_lib).
   wxWidgets_CONFIGURATION - Configuration to use
                             (e.g., msw, mswd, mswu, mswunivud, etc.)
   wxWidgets_EXCLUDE_COMMON_LIBRARIES
@@ -53,8 +53,6 @@ the following variables:
   wxWidgets_USE_UNIVERSAL
   wxWidgets_USE_STATIC
 
-
-
 There is also a wxWidgets_CONFIG_OPTIONS variable for all other
 options that need to be passed to the wx-config utility.  For example,
 to use the base toolkit found in the /usr/local path, set the variable
@@ -215,6 +213,32 @@ else()
   set(wxWidgets_USE_FILE UsewxWidgets)
 endif()
 
+# Known wxWidgets versions.
+set(wx_versions 3.3 3.2 3.1 3.0 2.9 2.8 2.7 2.6 2.5)
+
+macro(wx_extract_version)
+  unset(_wx_filename)
+  find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
+  dbg_msg("_wx_filename:  ${_wx_filename}")
+
+  if(NOT _wx_filename)
+    message(FATAL_ERROR "wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.")
+  endif()
+
+  file(READ "${_wx_filename}" _wx_version_h)
+  unset(_wx_filename CACHE)
+
+  string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*"
+    "\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" )
+  string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*"
+    "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
+  string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
+    "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
+  set(wxWidgets_VERSION_STRING
+    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
+  dbg_msg("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
+endmacro()
+
 #=====================================================================
 # Determine whether unix or win32 paths should be used
 #=====================================================================
@@ -269,10 +293,11 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
   #
   # Find libraries associated to a configuration.
   #
-  macro(WX_FIND_LIBS _PF _UNV _UCD _DBG)
+  macro(WX_FIND_LIBS _PF _UNV _UCD _DBG _VER)
     DBG_MSG_V("m_unv = ${_UNV}")
     DBG_MSG_V("m_ucd = ${_UCD}")
     DBG_MSG_V("m_dbg = ${_DBG}")
+    DBG_MSG_V("m_ver = ${_VER}")
 
     # FIXME: What if both regex libs are available. regex should be
     # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
@@ -290,28 +315,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 
     # Find wxWidgets multilib base libraries.
     find_library(WX_base${_DBG}
-      NAMES
-      wxbase31${_UCD}${_DBG}
-      wxbase30${_UCD}${_DBG}
-      wxbase29${_UCD}${_DBG}
-      wxbase28${_UCD}${_DBG}
-      wxbase27${_UCD}${_DBG}
-      wxbase26${_UCD}${_DBG}
-      wxbase25${_UCD}${_DBG}
+      NAMES wxbase${_VER}${_UCD}${_DBG}
       PATHS ${WX_LIB_DIR}
       NO_DEFAULT_PATH
       )
     mark_as_advanced(WX_base${_DBG})
     foreach(LIB net odbc xml)
       find_library(WX_${LIB}${_DBG}
-        NAMES
-        wxbase31${_UCD}${_DBG}_${LIB}
-        wxbase30${_UCD}${_DBG}_${LIB}
-        wxbase29${_UCD}${_DBG}_${LIB}
-        wxbase28${_UCD}${_DBG}_${LIB}
-        wxbase27${_UCD}${_DBG}_${LIB}
-        wxbase26${_UCD}${_DBG}_${LIB}
-        wxbase25${_UCD}${_DBG}_${LIB}
+        NAMES wxbase${_VER}${_UCD}${_DBG}_${LIB}
         PATHS ${WX_LIB_DIR}
         NO_DEFAULT_PATH
         )
@@ -320,14 +331,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
 
     # Find wxWidgets monolithic library.
     find_library(WX_mono${_DBG}
-      NAMES
-      wx${_PF}${_UNV}31${_UCD}${_DBG}
-      wx${_PF}${_UNV}30${_UCD}${_DBG}
-      wx${_PF}${_UNV}29${_UCD}${_DBG}
-      wx${_PF}${_UNV}28${_UCD}${_DBG}
-      wx${_PF}${_UNV}27${_UCD}${_DBG}
-      wx${_PF}${_UNV}26${_UCD}${_DBG}
-      wx${_PF}${_UNV}25${_UCD}${_DBG}
+      NAMES wx${_PF}${_UNV}${_VER}${_UCD}${_DBG}
       PATHS ${WX_LIB_DIR}
       NO_DEFAULT_PATH
       )
@@ -337,14 +341,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
                 stc ribbon propgrid webview)
       find_library(WX_${LIB}${_DBG}
-        NAMES
-        wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB}
-        wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB}
-        wx${_PF}${_UNV}29${_UCD}${_DBG}_${LIB}
-        wx${_PF}${_UNV}28${_UCD}${_DBG}_${LIB}
-        wx${_PF}${_UNV}27${_UCD}${_DBG}_${LIB}
-        wx${_PF}${_UNV}26${_UCD}${_DBG}_${LIB}
-        wx${_PF}${_UNV}25${_UCD}${_DBG}_${LIB}
+        NAMES wx${_PF}${_UNV}${_VER}${_UCD}${_DBG}_${LIB}
         PATHS ${WX_LIB_DIR}
         NO_DEFAULT_PATH
         )
@@ -447,6 +444,13 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
   # WIN32: Start actual work.
   #-------------------------------------------------------------------
 
+  set(wx_paths "wxWidgets")
+  foreach(version ${wx_versions})
+    foreach(patch RANGE 15 0 -1)
+      list(APPEND wx_paths "wxWidgets-${version}.${patch}")
+    endforeach()
+  endforeach()
+
   # Look for an installation tree.
   find_path(wxWidgets_ROOT_DIR
     NAMES include/wx/wx.h
@@ -458,50 +462,18 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
       D:/
       ENV ProgramFiles
     PATH_SUFFIXES
-      wxWidgets-3.1.0
-      wxWidgets-3.0.2
-      wxWidgets-3.0.1
-      wxWidgets-3.0.0
-      wxWidgets-2.9.5
-      wxWidgets-2.9.4
-      wxWidgets-2.9.3
-      wxWidgets-2.9.2
-      wxWidgets-2.9.1
-      wxWidgets-2.9.0
-      wxWidgets-2.8.9
-      wxWidgets-2.8.8
-      wxWidgets-2.8.7
-      wxWidgets-2.8.6
-      wxWidgets-2.8.5
-      wxWidgets-2.8.4
-      wxWidgets-2.8.3
-      wxWidgets-2.8.2
-      wxWidgets-2.8.1
-      wxWidgets-2.8.0
-      wxWidgets-2.7.4
-      wxWidgets-2.7.3
-      wxWidgets-2.7.2
-      wxWidgets-2.7.1
-      wxWidgets-2.7.0
-      wxWidgets-2.7.0-1
-      wxWidgets-2.6.4
-      wxWidgets-2.6.3
-      wxWidgets-2.6.2
-      wxWidgets-2.6.1
-      wxWidgets-2.5.4
-      wxWidgets-2.5.3
-      wxWidgets-2.5.2
-      wxWidgets-2.5.1
-      wxWidgets
+      ${wx_paths}
     DOC "wxWidgets base/installation directory"
     )
 
   # If wxWidgets_ROOT_DIR changed, clear lib dir.
   if(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+    if(NOT wxWidgets_LIB_DIR OR WX_ROOT_DIR)
+      set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
+          CACHE PATH "Cleared." FORCE)
+    endif()
     set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
         CACHE INTERNAL "wxWidgets_ROOT_DIR")
-    set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
-        CACHE PATH "Cleared." FORCE)
   endif()
 
   if(WX_ROOT_DIR)
@@ -655,10 +627,14 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
           set(wxWidgets_FOUND FALSE)
         endif()
 
+        # Get version number.
+        wx_extract_version()
+        set(VER "${wxWidgets_VERSION_MAJOR}${wxWidgets_VERSION_MINOR}")
+
         # Find wxWidgets libraries.
-        WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}")
+        WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "${DBG}" "${VER}")
         if(WX_USE_REL_AND_DBG)
-          WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d")
+          WX_FIND_LIBS("${PF}" "${UNV}" "${UCD}" "d" "${VER}")
         endif()
 
         # Settings for requested libs (i.e., include dir, libraries, etc.).
@@ -676,11 +652,17 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     endif()
   endif()
 
+  if(MINGW AND NOT wxWidgets_FOUND)
+    # Try unix search mode as well.
+    set(wxWidgets_FIND_STYLE "unix")
+    dbg_msg_v("wxWidgets_FIND_STYLE changed to unix")
+  endif()
+endif()
+
 #=====================================================================
 # UNIX_FIND_STYLE
 #=====================================================================
-else()
-  if(wxWidgets_FIND_STYLE STREQUAL "unix")
+if(wxWidgets_FIND_STYLE STREQUAL "unix")
     #-----------------------------------------------------------------
     # UNIX: Helper MACROS
     #-----------------------------------------------------------------
@@ -773,12 +755,14 @@ else()
     # Look for wx-config -- this can be set in the environment,
     # or try versioned and toolchain-versioned variants of the -config
     # executable as well.
+    set(wx_config_names "wx-config")
+    foreach(version ${wx_versions})
+      list(APPEND wx_config_names "wx-config-${version}" "wxgtk3u-${version}-config" "wxgtk2u-${version}-config")
+    endforeach()
     find_program(wxWidgets_CONFIG_EXECUTABLE
       NAMES
         $ENV{WX_CONFIG}
-        wx-config
-        wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8
-        wxgtk3u-3.1-config wxgtk3u-3.0-config wxgtk2u-2.8-config
+        ${wx_config_names}
       DOC "Location of wxWidgets library configuration provider binary (wx-config)."
       ONLY_CMAKE_FIND_ROOT_PATH
       )
@@ -942,19 +926,6 @@ else()
       endif()
       unset(_cygpath_exe CACHE)
     endif()
-
-#=====================================================================
-# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
-#=====================================================================
-  else()
-    if(NOT wxWidgets_FIND_QUIETLY)
-      message(STATUS
-        "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
-        "  Platform unknown/unsupported. It's neither WIN32 nor UNIX "
-        "find style."
-        )
-    endif()
-  endif()
 endif()
 
 # Check that all libraries are present, as wx-config does not check it
@@ -981,26 +952,7 @@ unset(_wx_lib_missing)
 
 # Check if a specific version was requested by find_package().
 if(wxWidgets_FOUND)
-  unset(_wx_filename)
-  find_file(_wx_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH)
-  dbg_msg("_wx_filename:  ${_wx_filename}")
-
-  if(NOT _wx_filename)
-    message(FATAL_ERROR "wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.")
-  endif()
-
-  file(READ "${_wx_filename}" _wx_version_h)
-  unset(_wx_filename CACHE)
-
-  string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*"
-    "\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" )
-  string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*"
-    "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
-  string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
-    "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
-  set(wxWidgets_VERSION_STRING
-    "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
-  dbg_msg("wxWidgets_VERSION_STRING:    ${wxWidgets_VERSION_STRING}")
+  wx_extract_version()
 endif()
 
 # Debug output:
diff --git a/deps/cmake/share/cmake-3.21/Modules/FindwxWindows.cmake b/deps/cmake/share/cmake-3.25/Modules/FindwxWindows.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/FindwxWindows.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FindwxWindows.cmake
index 07fbc1bf..2d46dbd5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FindwxWindows.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FindwxWindows.cmake
@@ -79,8 +79,7 @@ DEPRECATED
 
 
 
-AUTHOR Jan Woetzel <http://www.mip.informatik.uni-kiel.de/~jw>
-(07/2003-01/2006)
+AUTHOR Jan Woetzel (07/2003-01/2006)
 #]=======================================================================]
 
 # ------------------------------------------------------------------
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface.cmake b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface.cmake
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface.cmake
index 733c7232..af025afc 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface.cmake
@@ -343,6 +343,14 @@ function(FortranCInterface_VERIFY)
     set(_desc "Verifying Fortran/${lang} Compiler Compatibility")
     message(CHECK_START "${_desc}")
 
+    # Perform verification with only one architecture.
+    # FIXME: Add try_compile whole-project option to forward architectures.
+    if(CMAKE_OSX_ARCHITECTURES MATCHES "^([^;]+)(;|$)")
+      set(_FortranCInterface_OSX_ARCH "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_MATCH_1}")
+    else()
+      set(_FortranCInterface_OSX_ARCH "")
+    endif()
+
     cmake_policy(GET CMP0056 _FortranCInterface_CMP0056)
     if(_FortranCInterface_CMP0056 STREQUAL "NEW")
       set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}")
@@ -353,10 +361,10 @@ function(FortranCInterface_VERIFY)
     # Build a sample project which reports symbols.
     set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
     try_compile(FortranCInterface_VERIFY_${lang}_COMPILED
-      ${FortranCInterface_BINARY_DIR}/Verify${lang}
-      ${FortranCInterface_SOURCE_DIR}/Verify
-      VerifyFortranC # project name
-      VerifyFortranC # target name
+      PROJECT VerifyFortranC
+      TARGET VerifyFortranC
+      SOURCE_DIR ${FortranCInterface_SOURCE_DIR}/Verify
+      BINARY_DIR ${FortranCInterface_BINARY_DIR}/Verify${lang}
       CMAKE_FLAGS -DVERIFY_CXX=${verify_cxx}
                   -DCMAKE_VERBOSE_MAKEFILE=ON
                  "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
@@ -365,6 +373,7 @@ function(FortranCInterface_VERIFY)
                  "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}"
                  "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}"
                  "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}"
+                 ${_FortranCInterface_OSX_ARCH}
                  ${_FortranCInterface_EXE_LINKER_FLAGS}
       OUTPUT_VARIABLE _output)
     file(WRITE "${FortranCInterface_BINARY_DIR}/Verify${lang}/output.txt" "${_output}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/CMakeLists.txt b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/CMakeLists.txt
similarity index 81%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/CMakeLists.txt
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/CMakeLists.txt
index 13e4498a..4bd7006e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/CMakeLists.txt
+++ b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/CMakeLists.txt
@@ -43,6 +43,8 @@ set(module_symbols
   MYMODULE_mp_MYSUB       # Intel on Windows
   mymodule_mysub_         # PGI
   mymodule_MP_mysub       # NAG
+  _QMmy_modulePmy_sub     # LLVMFlang
+  _QMmymodulePmysub       # LLVMFlang
   ${FortranCInterface_MODULE_SYMBOLS}
   )
 list(REMOVE_DUPLICATES module_symbols)
@@ -102,6 +104,22 @@ set_property(TARGET symbols PROPERTY POSITION_INDEPENDENT_CODE 1)
 add_executable(FortranCInterface main.F call_sub.f ${call_mod})
 target_link_libraries(FortranCInterface PUBLIC symbols)
 
+# If IPO is enabled here, GCC gfortran >= 12.0 will obfuscate
+# the strings of the return values in the compiled executable,
+# which we use to regex match against later.
+# The static libraries must be build with IPO and non-IPO objects,
+# as that will ensure the verify step will operate on IPO objects,
+# if requested by the system compiler flags.
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND
+  CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
+  target_compile_options(FortranCInterface PRIVATE "-fno-lto")
+  target_compile_options(myfort PRIVATE "-flto=auto" "-ffat-lto-objects")
+endif()
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
+  CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
+  target_compile_options(symbols PRIVATE "-flto=auto" "-ffat-lto-objects")
+endif()
+
 file(GENERATE OUTPUT exe-$<CONFIG>.cmake CONTENT [[
 set(FortranCInterface_EXE "$<TARGET_FILE:FortranCInterface>")
 ]])
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Detect.cmake b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Detect.cmake
similarity index 88%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Detect.cmake
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Detect.cmake
index 9e5726b0..6401aed1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Detect.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Detect.cmake
@@ -8,11 +8,10 @@ configure_file(${FortranCInterface_SOURCE_DIR}/Input.cmake.in
 # configuration changes.
 if(NOT EXISTS ${FortranCInterface_BINARY_DIR}/Output.cmake
     OR NOT EXISTS ${FortranCInterface_BINARY_DIR}/Input.cmake
-    OR NOT EXISTS ${FortranCInterface_BINARY_DIR}/Output.cmake.in
     OR NOT ${FortranCInterface_BINARY_DIR}/Output.cmake
       IS_NEWER_THAN ${FortranCInterface_BINARY_DIR}/Input.cmake
     OR NOT ${FortranCInterface_SOURCE_DIR}/Output.cmake
-      IS_NEWER_THAN ${FortranCInterface_BINARY_DIR}/Output.cmake.in
+      IS_NEWER_THAN ${FortranCInterface_SOURCE_DIR}/Output.cmake.in
     OR NOT ${FortranCInterface_BINARY_DIR}/Output.cmake
       IS_NEWER_THAN ${FortranCInterface_SOURCE_DIR}/CMakeLists.txt
     OR NOT ${FortranCInterface_BINARY_DIR}/Output.cmake
@@ -29,6 +28,14 @@ unset(FortranCInterface_VERIFIED_CXX CACHE)
 
 set(_result)
 
+# Perform detection with only one architecture so that
+# the info strings are not repeated.
+if(CMAKE_OSX_ARCHITECTURES MATCHES "^([^;]+)(;|$)")
+  set(_FortranCInterface_OSX_ARCH "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_MATCH_1}")
+else()
+  set(_FortranCInterface_OSX_ARCH "")
+endif()
+
 cmake_policy(GET CMP0056 _FortranCInterface_CMP0056)
 if(_FortranCInterface_CMP0056 STREQUAL "NEW")
   set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}")
@@ -40,20 +47,22 @@ unset(_FortranCInterface_CMP0056)
 # Build a sample project which reports symbols.
 set(CMAKE_TRY_COMPILE_CONFIGURATION Release)
 try_compile(FortranCInterface_COMPILED
-  ${FortranCInterface_BINARY_DIR}
-  ${FortranCInterface_SOURCE_DIR}
-  FortranCInterface # project name
-  FortranCInterface # target name
+  PROJECT FortranCInterface
+  TARGET FortranCInterface
+  SOURCE_DIR ${FortranCInterface_SOURCE_DIR}
+  BINARY_DIR ${FortranCInterface_BINARY_DIR}
   CMAKE_FLAGS
     "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}"
     "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}"
     "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}"
     "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}"
+    ${_FortranCInterface_OSX_ARCH}
     ${_FortranCInterface_EXE_LINKER_FLAGS}
   OUTPUT_VARIABLE FortranCInterface_OUTPUT)
 set(FortranCInterface_COMPILED ${FortranCInterface_COMPILED})
 unset(FortranCInterface_COMPILED CACHE)
 unset(_FortranCInterface_EXE_LINKER_FLAGS)
+unset(_FortranCInterface_OSX_ARCH)
 
 # Locate the sample project executable.
 set(FortranCInterface_EXE)
@@ -86,8 +95,8 @@ set(_case_MYSUB "UPPER")
 set(_case_MY_SUB "UPPER")
 set(_global_regex  "^(_*)(mysub|MYSUB)([_$]*)$")
 set(_global__regex "^(_*)(my_sub|MY_SUB)([_$]*)$")
-set(_module_regex  "^(_*)(mymodule|MYMODULE)([A-Za-z_$]*)(mysub|MYSUB)([_$]*)$")
-set(_module__regex "^(_*)(my_module|MY_MODULE)([A-Za-z_$]*)(my_sub|MY_SUB)([_$]*)$")
+set(_module_regex "^(_*)([A-Za-z$]*)(mymodule|MYMODULE)([A-Za-z_$]*)(mysub|MYSUB)([_$]*)$")
+set(_module__regex "^(_*)([A-Za-z$]*)(my_module|MY_MODULE)([A-Za-z_$]*)(my_sub|MY_SUB)([_$]*)$")
 
 # Parse the symbol names.
 foreach(symbol ${FortranCInterface_SYMBOLS})
@@ -106,7 +115,7 @@ foreach(symbol ${FortranCInterface_SYMBOLS})
 
     # Look for module symbols.
     string(REGEX REPLACE "${_module_${form}regex}"
-                         "\\1;\\2;\\3;\\4;\\5" pieces "${symbol}")
+                         "\\1\\2;\\3;\\4;\\5;\\6" pieces "${symbol}")
     list(LENGTH pieces len)
     if(len EQUAL 5)
       set(FortranCInterface_MODULE_${form}SYMBOL "${symbol}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Input.cmake.in b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Input.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Input.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Input.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/MYMODULE.c b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/MYMODULE.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/MYMODULE.c
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/MYMODULE.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/MY_MODULE.c b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/MY_MODULE.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/MY_MODULE.c
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/MY_MODULE.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Macro.h.in b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Macro.h.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Macro.h.in
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Macro.h.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Output.cmake.in b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Output.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Output.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Output.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/CMakeLists.txt b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/CMakeLists.txt
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/CMakeLists.txt
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/CMakeLists.txt
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/VerifyC.c b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/VerifyC.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/VerifyC.c
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/VerifyC.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/VerifyCXX.cxx b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/VerifyCXX.cxx
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/VerifyCXX.cxx
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/VerifyCXX.cxx
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/VerifyFortran.f b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/VerifyFortran.f
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/VerifyFortran.f
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/VerifyFortran.f
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/main.c b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/main.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/Verify/main.c
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/Verify/main.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/call_mod.f90 b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/call_mod.f90
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/call_mod.f90
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/call_mod.f90
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/call_sub.f b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/call_sub.f
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/call_sub.f
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/call_sub.f
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/main.F b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/main.F
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/main.F
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/main.F
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/my_module.f90 b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/my_module.f90
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/my_module.f90
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/my_module.f90
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/my_module_.c b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/my_module_.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/my_module_.c
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/my_module_.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/my_sub.f b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/my_sub.f
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/my_sub.f
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/my_sub.f
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/mymodule.f90 b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/mymodule.f90
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/mymodule.f90
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/mymodule.f90
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/mymodule_.c b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/mymodule_.c
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/mymodule_.c
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/mymodule_.c
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/mysub.f b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/mysub.f
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/mysub.f
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/mysub.f
diff --git a/deps/cmake/share/cmake-3.21/Modules/FortranCInterface/symbol.c.in b/deps/cmake/share/cmake-3.25/Modules/FortranCInterface/symbol.c.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/FortranCInterface/symbol.c.in
rename to deps/cmake/share/cmake-3.25/Modules/FortranCInterface/symbol.c.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/GNUInstallDirs.cmake b/deps/cmake/share/cmake-3.25/Modules/GNUInstallDirs.cmake
similarity index 88%
rename from deps/cmake/share/cmake-3.21/Modules/GNUInstallDirs.cmake
rename to deps/cmake/share/cmake-3.25/Modules/GNUInstallDirs.cmake
index d81033ca..97968549 100644
--- a/deps/cmake/share/cmake-3.21/Modules/GNUInstallDirs.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/GNUInstallDirs.cmake
@@ -52,8 +52,10 @@ where ``<dir>`` is one of:
   .. versionadded:: 3.9
     run-time variable data (``LOCALSTATEDIR/run``)
 ``LIBDIR``
-  object code libraries (``lib`` or ``lib64``
-  or ``lib/<multiarch-tuple>`` on Debian)
+  object code libraries (``lib`` or ``lib64``)
+
+  On Debian, this may be ``lib/<multiarch-tuple>`` when
+  :variable:`CMAKE_INSTALL_PREFIX` is ``/usr``.
 ``INCLUDEDIR``
   C header files (``include``)
 ``OLDINCLUDEDIR``
@@ -110,6 +112,8 @@ The following values of :variable:`CMAKE_INSTALL_PREFIX` are special:
   For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc/opt/...``.
   This is defined by the `Filesystem Hierarchy Standard`_.
 
+  This behavior does not apply to paths under ``/opt/homebrew/...``.
+
 .. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
 
 Macros
@@ -180,6 +184,8 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin"
   "User executables (bin)")
 _GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "sbin"
   "System admin executables (sbin)")
+_GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec"
+  "Program executables (libexec)")
 _GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc"
   "Read-only single-machine data (etc)")
 _GNUInstallDirs_cache_path(CMAKE_INSTALL_SHAREDSTATEDIR "com"
@@ -216,6 +222,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
   # Override this default 'lib' with 'lib64' iff:
   #  - we are on Linux system but NOT cross-compiling
   #  - we are NOT on debian
+  #  - we are NOT building for conda
   #  - we are on a 64 bits system
   # reason is: amd64 ABI: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
   # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
@@ -237,11 +244,36 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
       "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
       "Please enable at least one language before including GNUInstallDirs.")
   endif()
+
   if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
-      AND NOT CMAKE_CROSSCOMPILING
-      AND NOT EXISTS "/etc/alpine-release"
-      AND NOT EXISTS "/etc/arch-release")
-    if (EXISTS "/etc/debian_version") # is this a debian system ?
+      AND NOT CMAKE_CROSSCOMPILING)
+    unset(__system_type_for_install)
+    if(DEFINED ENV{CONDA_BUILD} AND DEFINED ENV{PREFIX})
+      set(conda_prefix "$ENV{PREFIX}")
+      cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE)
+      if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix)
+        set(__system_type_for_install "conda")
+      endif()
+    elseif(DEFINED ENV{CONDA_PREFIX})
+      set(conda_prefix "$ENV{CONDA_PREFIX}")
+      cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE)
+      if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix AND
+         NOT ("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$" OR
+              "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$"))
+        set(__system_type_for_install "conda")
+      endif()
+    endif()
+    if(NOT __system_type_for_install)
+      if (EXISTS "/etc/alpine-release")
+        set(__system_type_for_install "alpine")
+      elseif (EXISTS "/etc/arch-release")
+        set(__system_type_for_install "arch linux")
+      elseif (EXISTS "/etc/debian_version")
+        set(__system_type_for_install "debian")
+      endif()
+    endif()
+
+    if(__system_type_for_install STREQUAL "debian")
       if(CMAKE_LIBRARY_ARCHITECTURE)
         if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
           set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
@@ -251,7 +283,8 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
           set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
         endif()
       endif()
-    else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+    elseif(NOT DEFINED __system_type_for_install)
+      # not debian, alpine, arch, or conda so rely on CMAKE_SIZEOF_VOID_P:
       if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
         set(_LIBDIR_DEFAULT "lib64")
         if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
@@ -260,6 +293,8 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
       endif()
     endif()
   endif()
+  unset(__system_type_for_install)
+
   if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
     set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
   elseif(DEFINED __LAST_LIBDIR_DEFAULT
@@ -274,19 +309,6 @@ set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE IN
 unset(_libdir_set)
 unset(__LAST_LIBDIR_DEFAULT)
 
-if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
-    AND NOT CMAKE_CROSSCOMPILING
-    AND NOT EXISTS "/etc/arch-release"
-    AND EXISTS "/etc/debian_version" # is this a debian system ?
-    AND "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
-  # see https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec
-  # and https://www.debian.org/doc/debian-policy/ch-opersys#file-system-structure (section 9.1.1 bullet point 4)
-  _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBDIR}"
-    "Program executables (${CMAKE_INSTALL_LIBDIR})")
-else()
-  _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec"
-    "Program executables (libexec)")
-endif()
 _GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include"
   "C header files (include)")
 _GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include"
@@ -310,7 +332,7 @@ else()
     "Info documentation (DATAROOTDIR/info)")
 endif()
 
-if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
+if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$" AND NOT CMAKE_SYSTEM_NAME MATCHES "^(FreeBSD)$")
   _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
     "Man documentation (man)")
 else()
@@ -350,7 +372,7 @@ mark_as_advanced(
 macro(GNUInstallDirs_get_absolute_install_dir absvar var)
   set(GGAID_extra_args ${ARGN})
   list(LENGTH GGAID_extra_args GGAID_extra_arg_count)
-  if(GGAID_extra_arg_count GREATER 0)
+  if(GGAID_extra_arg_count GREATER "0")
     list(GET GGAID_extra_args 0 GGAID_dir)
   else()
     # Historical behavior: use ${dir} from caller's scope
@@ -380,7 +402,7 @@ macro(GNUInstallDirs_get_absolute_install_dir absvar var)
       else()
         set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
       endif()
-    elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/.*")
+    elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/" AND NOT "${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/homebrew/")
       if("${GGAID_dir}" STREQUAL "SYSCONFDIR" OR "${GGAID_dir}" STREQUAL "LOCALSTATEDIR" OR "${GGAID_dir}" STREQUAL "RUNSTATEDIR")
         set(${absvar} "/${${var}}${CMAKE_INSTALL_PREFIX}")
       else()
diff --git a/deps/cmake/share/cmake-3.21/Modules/GenerateExportHeader.cmake b/deps/cmake/share/cmake-3.25/Modules/GenerateExportHeader.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/GenerateExportHeader.cmake
rename to deps/cmake/share/cmake-3.25/Modules/GenerateExportHeader.cmake
index a9a9c593..7461a3e5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/GenerateExportHeader.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/GenerateExportHeader.cmake
@@ -231,7 +231,7 @@ macro(_test_compiler_hidden_visibility)
       AND NOT _INTEL_TOO_OLD
       AND NOT WIN32
       AND NOT CYGWIN
-      AND NOT CMAKE_CXX_COMPILER_ID MATCHES XL
+      AND NOT CMAKE_CXX_COMPILER_ID MATCHES "^(IBMClang|XLClang|XL)$"
       AND NOT CMAKE_CXX_COMPILER_ID MATCHES "^(PGI|NVHPC)$"
       AND NOT CMAKE_CXX_COMPILER_ID MATCHES Watcom)
     if (CMAKE_CXX_COMPILER_LOADED)
diff --git a/deps/cmake/share/cmake-3.21/Modules/GetPrerequisites.cmake b/deps/cmake/share/cmake-3.25/Modules/GetPrerequisites.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/GetPrerequisites.cmake
rename to deps/cmake/share/cmake-3.25/Modules/GetPrerequisites.cmake
index e90a9b5b..0ba35b6b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/GetPrerequisites.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/GetPrerequisites.cmake
@@ -746,7 +746,7 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
     set(gp_regex_error "")
     set(gp_regex_fallback "")
     set(gp_regex_cmp_count 1)
-  elseif(gp_tool MATCHES "objdump$")
+  elseif(gp_tool MATCHES "objdump(\\.exe)?$")
     set(gp_cmd_args "-p")
     set(gp_regex "^\t*DLL Name: (.*\\.[Dd][Ll][Ll])${eol_char}$")
     set(gp_regex_error "")
@@ -755,11 +755,13 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa
     # objdump generates copious output so we create a grep filter to pre-filter results
     if(WIN32)
       find_program(gp_grep_cmd findstr)
+      set(gp_grep_cmd_arg "")
     else()
       find_program(gp_grep_cmd grep)
+      set(gp_grep_cmd_arg "-a")
     endif()
     if(gp_grep_cmd)
-      set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "-a" "^[[:blank:]]*DLL Name: ")
+      set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "${gp_grep_cmd_arg}" "^[[:blank:]]*DLL Name: ")
     endif()
   else()
     message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...")
diff --git a/deps/cmake/share/cmake-3.21/Modules/GoogleTest.cmake b/deps/cmake/share/cmake-3.25/Modules/GoogleTest.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/GoogleTest.cmake
rename to deps/cmake/share/cmake-3.25/Modules/GoogleTest.cmake
index 80d8e239..b8dc482e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/GoogleTest.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/GoogleTest.cmake
@@ -151,6 +151,7 @@ same as the Google Test name (i.e. ``suite.testcase``); see also
                          [WORKING_DIRECTORY dir]
                          [TEST_PREFIX prefix]
                          [TEST_SUFFIX suffix]
+                         [TEST_FILTER expr]
                          [NO_PRETTY_TYPES] [NO_PRETTY_VALUES]
                          [PROPERTIES name1 value1...]
                          [TEST_LIST var]
@@ -204,6 +205,15 @@ same as the Google Test name (i.e. ``suite.testcase``); see also
     every discovered test case.  Both ``TEST_PREFIX`` and ``TEST_SUFFIX`` may
     be specified.
 
+  ``TEST_FILTER expr``
+    .. versionadded:: 3.22
+
+    Filter expression to pass as a ``--gtest_filter`` argument during test
+    discovery.  Note that the expression is a wildcard-based format that
+    matches against the original test names as used by gtest.  For type or
+    value-parameterized tests, these names may be different to the potentially
+    pretty-printed test names that ``ctest`` uses.
+
   ``NO_PRETTY_TYPES``
     By default, the type index of type-parameterized tests is replaced by the
     actual type name in the CTest test name.  If this behavior is undesirable
@@ -338,7 +348,7 @@ function(gtest_add_tests)
   unset(testList)
 
   set(gtest_case_name_regex ".*\\( *([A-Za-z_0-9]+) *, *([A-Za-z_0-9]+) *\\).*")
-  set(gtest_test_type_regex "(TYPED_TEST|TEST_?[FP]?)")
+  set(gtest_test_type_regex "(TYPED_TEST|TEST)_?[FP]?")
 
   foreach(source IN LISTS ARGS_SOURCES)
     if(NOT ARGS_SKIP_DEPENDENCY)
@@ -351,7 +361,9 @@ function(gtest_add_tests)
 
       # Parameterized tests have a different signature for the filter
       if("x${test_type}" STREQUAL "xTEST_P")
-        string(REGEX REPLACE ${gtest_case_name_regex}  "*/\\1.\\2/*" gtest_test_name ${hit})
+        string(REGEX REPLACE ${gtest_case_name_regex} "*/\\1.\\2/*" gtest_test_name ${hit})
+      elseif("x${test_type}" STREQUAL "xTYPED_TEST_P")
+        string(REGEX REPLACE ${gtest_case_name_regex} "*/\\1/*.\\2" gtest_test_name ${hit})
       elseif("x${test_type}" STREQUAL "xTEST_F" OR "x${test_type}" STREQUAL "xTEST")
         string(REGEX REPLACE ${gtest_case_name_regex} "\\1.\\2" gtest_test_name ${hit})
       elseif("x${test_type}" STREQUAL "xTYPED_TEST")
@@ -411,7 +423,7 @@ function(gtest_discover_tests TARGET)
     ""
     "NO_PRETTY_TYPES;NO_PRETTY_VALUES"
     "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;DISCOVERY_TIMEOUT;XML_OUTPUT_DIR;DISCOVERY_MODE"
-    "EXTRA_ARGS;PROPERTIES"
+    "EXTRA_ARGS;PROPERTIES;TEST_FILTER"
     ${ARGN}
   )
 
@@ -475,6 +487,7 @@ function(gtest_discover_tests TARGET)
               -D "TEST_PROPERTIES=${_PROPERTIES}"
               -D "TEST_PREFIX=${_TEST_PREFIX}"
               -D "TEST_SUFFIX=${_TEST_SUFFIX}"
+              -D "TEST_FILTER=${_TEST_FILTER}"
               -D "NO_PRETTY_TYPES=${_NO_PRETTY_TYPES}"
               -D "NO_PRETTY_VALUES=${_NO_PRETTY_VALUES}"
               -D "TEST_LIST=${_TEST_LIST}"
@@ -505,7 +518,8 @@ function(gtest_discover_tests TARGET)
     string(CONCAT ctest_include_content
       "if(EXISTS \"$<TARGET_FILE:${TARGET}>\")"                                    "\n"
       "  if(NOT EXISTS \"${ctest_tests_file}\" OR"                                 "\n"
-      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"$<TARGET_FILE:${TARGET}>\")" "\n"
+      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"$<TARGET_FILE:${TARGET}>\" OR\n"
+      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"\${CMAKE_CURRENT_LIST_FILE}\")\n"
       "    include(\"${_GOOGLETEST_DISCOVER_TESTS_SCRIPT}\")"                      "\n"
       "    gtest_discover_tests_impl("                                             "\n"
       "      TEST_EXECUTABLE"        " [==[" "$<TARGET_FILE:${TARGET}>"   "]==]"   "\n"
@@ -515,6 +529,7 @@ function(gtest_discover_tests TARGET)
       "      TEST_PROPERTIES"        " [==[" "${_PROPERTIES}"             "]==]"   "\n"
       "      TEST_PREFIX"            " [==[" "${_TEST_PREFIX}"            "]==]"   "\n"
       "      TEST_SUFFIX"            " [==[" "${_TEST_SUFFIX}"            "]==]"   "\n"
+      "      TEST_FILTER"            " [==[" "${_TEST_FILTER}"            "]==]"   "\n"
       "      NO_PRETTY_TYPES"        " [==[" "${_NO_PRETTY_TYPES}"        "]==]"   "\n"
       "      NO_PRETTY_VALUES"       " [==[" "${_NO_PRETTY_VALUES}"       "]==]"   "\n"
       "      TEST_LIST"              " [==[" "${_TEST_LIST}"              "]==]"   "\n"
diff --git a/deps/cmake/share/cmake-3.21/Modules/GoogleTestAddTests.cmake b/deps/cmake/share/cmake-3.25/Modules/GoogleTestAddTests.cmake
similarity index 51%
rename from deps/cmake/share/cmake-3.21/Modules/GoogleTestAddTests.cmake
rename to deps/cmake/share/cmake-3.25/Modules/GoogleTestAddTests.cmake
index 0f79c9af..2bd0cc9e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/GoogleTestAddTests.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/GoogleTestAddTests.cmake
@@ -9,7 +9,7 @@ set(flush_tests_MODE WRITE)
 # Flushes script to ${_CTEST_FILE}
 macro(flush_script)
   file(${flush_tests_MODE} "${_CTEST_FILE}" "${script}")
-  set(flush_tests_MODE APPEND)
+  set(flush_tests_MODE APPEND PARENT_SCOPE)
 
   set(script "")
 endmacro()
@@ -20,31 +20,55 @@ macro(flush_tests_buffer)
   set(tests_buffer "")
 endmacro()
 
-macro(add_command NAME)
-  set(_args "")
-  foreach(_arg ${ARGN})
-    if(_arg MATCHES "[^-./:a-zA-Z0-9_]")
-      string(APPEND _args " [==[${_arg}]==]")
+function(add_command NAME TEST_NAME)
+  set(args "")
+  foreach(arg ${ARGN})
+    if(arg MATCHES "[^-./:a-zA-Z0-9_]")
+      string(APPEND args " [==[${arg}]==]")
     else()
-      string(APPEND _args " ${_arg}")
+      string(APPEND args " ${arg}")
     endif()
   endforeach()
-  string(APPEND script "${NAME}(${_args})\n")
-  string(LENGTH "${script}" _script_len)
-  if(${_script_len} GREATER "50000")
+  string(APPEND script "${NAME}(${TEST_NAME} ${args})\n")
+  string(LENGTH "${script}" script_len)
+  if(${script_len} GREATER "50000")
     flush_script()
   endif()
-  # Unsets macro local variables to prevent leakage outside of this macro.
-  unset(_args)
-  unset(_script_len)
-endmacro()
+  set(script "${script}" PARENT_SCOPE)
+endfunction()
+
+function(generate_testname_guards OUTPUT OPEN_GUARD_VAR CLOSE_GUARD_VAR)
+  set(open_guard "[=[")
+  set(close_guard "]=]")
+  set(counter 1)
+  while("${OUTPUT}" MATCHES "${close_guard}")
+    math(EXPR counter "${counter} + 1")
+    string(REPEAT "=" ${counter} equals)
+    set(open_guard "[${equals}[")
+    set(close_guard "]${equals}]")
+  endwhile()
+  set(${OPEN_GUARD_VAR} "${open_guard}" PARENT_SCOPE)
+  set(${CLOSE_GUARD_VAR} "${close_guard}" PARENT_SCOPE)
+endfunction()
+
+function(escape_square_brackets OUTPUT BRACKET PLACEHOLDER PLACEHOLDER_VAR OUTPUT_VAR)
+  if("${OUTPUT}" MATCHES "\\${BRACKET}")
+    set(placeholder "${PLACEHOLDER}")
+    while("${OUTPUT}" MATCHES "${placeholder}")
+        set(placeholder "${placeholder}_")
+    endwhile()
+    string(REPLACE "${BRACKET}" "${placeholder}" OUTPUT "${OUTPUT}")
+    set(${PLACEHOLDER_VAR} "${placeholder}" PARENT_SCOPE)
+    set(${OUTPUT_VAR} "${OUTPUT}" PARENT_SCOPE)
+  endif()
+endfunction()
 
 function(gtest_discover_tests_impl)
 
   cmake_parse_arguments(
     ""
     ""
-    "NO_PRETTY_TYPES;NO_PRETTY_VALUES;TEST_EXECUTABLE;TEST_WORKING_DIR;TEST_PREFIX;TEST_SUFFIX;TEST_LIST;CTEST_FILE;TEST_DISCOVERY_TIMEOUT;TEST_XML_OUTPUT_DIR"
+    "NO_PRETTY_TYPES;NO_PRETTY_VALUES;TEST_EXECUTABLE;TEST_WORKING_DIR;TEST_PREFIX;TEST_SUFFIX;TEST_LIST;CTEST_FILE;TEST_DISCOVERY_TIMEOUT;TEST_XML_OUTPUT_DIR;TEST_FILTER"
     "TEST_EXTRA_ARGS;TEST_PROPERTIES;TEST_EXECUTOR"
     ${ARGN}
   )
@@ -58,6 +82,12 @@ function(gtest_discover_tests_impl)
   set(tests)
   set(tests_buffer)
 
+  if(_TEST_FILTER)
+    set(filter "--gtest_filter=${_TEST_FILTER}")
+  else()
+    set(filter)
+  endif()
+
   # Run test executable to get list of available tests
   if(NOT EXISTS "${_TEST_EXECUTABLE}")
     message(FATAL_ERROR
@@ -66,7 +96,7 @@ function(gtest_discover_tests_impl)
     )
   endif()
   execute_process(
-    COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" --gtest_list_tests
+    COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" --gtest_list_tests ${filter}
     WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
     TIMEOUT ${_TEST_DISCOVERY_TIMEOUT}
     OUTPUT_VARIABLE output
@@ -74,15 +104,23 @@ function(gtest_discover_tests_impl)
   )
   if(NOT ${result} EQUAL 0)
     string(REPLACE "\n" "\n    " output "${output}")
+    if(_TEST_EXECUTOR)
+      set(path "${_TEST_EXECUTOR} ${_TEST_EXECUTABLE}")
+    else()
+      set(path "${_TEST_EXECUTABLE}")
+    endif()
     message(FATAL_ERROR
       "Error running test executable.\n"
-      "  Path: '${_TEST_EXECUTABLE}'\n"
+      "  Path: '${path}'\n"
       "  Result: ${result}\n"
       "  Output:\n"
       "    ${output}\n"
     )
   endif()
 
+  generate_testname_guards("${output}" open_guard close_guard)
+  escape_square_brackets("${output}" "[" "__osb" open_sb output)
+  escape_square_brackets("${output}" "]" "__csb" close_sb output)
   # Preserve semicolon in test-parameters
   string(REPLACE [[;]] [[\;]] output "${output}")
   string(REPLACE "\n" ";" output "${output}")
@@ -94,41 +132,48 @@ function(gtest_discover_tests_impl)
       # Do we have a module name or a test name?
       if(NOT line MATCHES "^  ")
         # Module; remove trailing '.' to get just the name...
-        string(REGEX REPLACE "\\.( *#.*)?" "" suite "${line}")
-        if(line MATCHES "#" AND NOT _NO_PRETTY_TYPES)
-          string(REGEX REPLACE "/[0-9]\\.+ +#.*= +" "/" pretty_suite "${line}")
+        string(REGEX REPLACE "\\.( *#.*)?$" "" suite "${line}")
+        if(line MATCHES "#")
+          string(REGEX REPLACE "/.*" "" pretty_suite "${line}")
+          if(NOT _NO_PRETTY_TYPES)
+            string(REGEX REPLACE ".*/[0-9]+[ .#]+TypeParam = (.*)" "\\1" type_parameter "${line}")
+          else()
+            string(REGEX REPLACE ".*/([0-9]+)[ .#]+TypeParam = .*" "\\1" type_parameter "${line}")
+          endif()
+          set(test_name_template "@prefix@@pretty_suite@.@pretty_test@<@type_parameter@>@suffix@")
         else()
           set(pretty_suite "${suite}")
+          set(test_name_template "@prefix@@pretty_suite@.@pretty_test@@suffix@")
         endif()
         string(REGEX REPLACE "^DISABLED_" "" pretty_suite "${pretty_suite}")
       else()
-        # Test name; strip spaces and comments to get just the name...
-        string(REGEX REPLACE " +" "" test "${line}")
+        string(STRIP "${line}" test)
         if(test MATCHES "#" AND NOT _NO_PRETTY_VALUES)
-          string(REGEX REPLACE "/[0-9]+#GetParam..=" "/" pretty_test "${test}")
+          string(REGEX REPLACE "/[0-9]+[ #]+GetParam\\(\\) = " "/" pretty_test "${test}")
         else()
-          string(REGEX REPLACE "#.*" "" pretty_test "${test}")
+          string(REGEX REPLACE " +#.*" "" pretty_test "${test}")
         endif()
         string(REGEX REPLACE "^DISABLED_" "" pretty_test "${pretty_test}")
-        string(REGEX REPLACE "#.*" "" test "${test}")
+        string(REGEX REPLACE " +#.*" "" test "${test}")
         if(NOT "${_TEST_XML_OUTPUT_DIR}" STREQUAL "")
           set(TEST_XML_OUTPUT_PARAM "--gtest_output=xml:${_TEST_XML_OUTPUT_DIR}/${prefix}${suite}.${test}${suffix}.xml")
         else()
           unset(TEST_XML_OUTPUT_PARAM)
         endif()
 
-        # sanitize test name for further processing downstream
-        set(testname "${prefix}${pretty_suite}.${pretty_test}${suffix}")
-        # escape \
-        string(REPLACE [[\]] [[\\]] testname "${testname}")
-        # escape ;
-        string(REPLACE [[;]] [[\;]] testname "${testname}")
-        # escape $
-        string(REPLACE [[$]] [[\$]] testname "${testname}")
+        string(CONFIGURE "${test_name_template}" testname)
+        # unescape []
+        if(open_sb)
+          string(REPLACE "${open_sb}" "[" testname "${testname}")
+        endif()
+        if(close_sb)
+          string(REPLACE "${close_sb}" "]" testname "${testname}")
+        endif()
+        set(guarded_testname "${open_guard}${testname}${close_guard}")
 
-        # ...and add to script
+        # add to script
         add_command(add_test
-          "${testname}"
+          "${guarded_testname}"
           ${_TEST_EXECUTOR}
           "${_TEST_EXECUTABLE}"
           "--gtest_filter=${suite}.${test}"
@@ -138,21 +183,28 @@ function(gtest_discover_tests_impl)
         )
         if(suite MATCHES "^DISABLED_" OR test MATCHES "^DISABLED_")
           add_command(set_tests_properties
-            "${testname}"
+            "${guarded_testname}"
             PROPERTIES DISABLED TRUE
           )
         endif()
+
         add_command(set_tests_properties
-          "${testname}"
+          "${guarded_testname}"
           PROPERTIES
           WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-          SKIP_REGULAR_EXPRESSION "\\\\[  SKIPPED \\\\]"
+          SKIP_REGULAR_EXPRESSION "\\[  SKIPPED \\]"
           ${properties}
         )
-        list(APPEND tests_buffer "${testname}")
-        list(LENGTH tests_buffer tests_buffer_length)
-        if(${tests_buffer_length} GREATER "250")
-          flush_tests_buffer()
+
+        # possibly unbalanced square brackets render lists invalid so skip such tests in ${_TEST_LIST}
+        if(NOT "${testname}" MATCHES [=[(\[|\])]=])
+          # escape ;
+          string(REPLACE [[;]] [[\\;]] testname "${testname}")
+          list(APPEND tests_buffer "${testname}")
+          list(LENGTH tests_buffer tests_buffer_length)
+          if(${tests_buffer_length} GREATER "250")
+            flush_tests_buffer()
+          endif()
         endif()
       endif()
     endif()
@@ -162,7 +214,7 @@ function(gtest_discover_tests_impl)
   # Create a list of all discovered tests, which users may use to e.g. set
   # properties on the tests
   flush_tests_buffer()
-  add_command(set ${_TEST_LIST} ${tests})
+  add_command(set "" ${_TEST_LIST} "${tests}")
 
   # Write CTest script
   flush_script()
@@ -178,6 +230,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
     TEST_WORKING_DIR ${TEST_WORKING_DIR}
     TEST_PREFIX ${TEST_PREFIX}
     TEST_SUFFIX ${TEST_SUFFIX}
+    TEST_FILTER ${TEST_FILTER}
     TEST_LIST ${TEST_LIST}
     CTEST_FILE ${CTEST_FILE}
     TEST_DISCOVERY_TIMEOUT ${TEST_DISCOVERY_TIMEOUT}
diff --git a/deps/cmake/share/cmake-3.21/Modules/ITKCompatibility.cmake b/deps/cmake/share/cmake-3.25/Modules/ITKCompatibility.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/ITKCompatibility.cmake
rename to deps/cmake/share/cmake-3.25/Modules/ITKCompatibility.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/InstallRequiredSystemLibraries.cmake b/deps/cmake/share/cmake-3.25/Modules/InstallRequiredSystemLibraries.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/InstallRequiredSystemLibraries.cmake
rename to deps/cmake/share/cmake-3.25/Modules/InstallRequiredSystemLibraries.cmake
index fa7b125f..d5e5fd21 100644
--- a/deps/cmake/share/cmake-3.21/Modules/InstallRequiredSystemLibraries.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/InstallRequiredSystemLibraries.cmake
@@ -73,6 +73,8 @@ set(_IRSL_HAVE_MSVC FALSE)
 foreach(LANG IN ITEMS C CXX Fortran)
   if("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "Intel")
     if(NOT _IRSL_HAVE_Intel)
+      # The oneAPI icx/ifx compilers are under ${os}/bin.
+      # The classic icc/icpc/icl/ifort compilers may be under ${os}/bin/intel64.
       get_filename_component(_Intel_basedir "${CMAKE_${LANG}_COMPILER}" PATH)
       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(_Intel_archdir intel64)
@@ -80,19 +82,37 @@ foreach(LANG IN ITEMS C CXX Fortran)
         set(_Intel_archdir ia32)
       endif()
       set(_Intel_compiler_ver ${CMAKE_${LANG}_COMPILER_VERSION})
-      if(WIN32 AND EXISTS "${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler")
-        get_filename_component(_Intel_redistdir "${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler" ABSOLUTE)
-      elseif(WIN32)
-        get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler" ABSOLUTE)
+      if(WIN32)
+        set(_Intel_possible_redistdirs
+          "${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler"
+          "${_Intel_basedir}/../redist/${_Intel_archdir}/compiler"
+          "${_Intel_basedir}/../../redist/${_Intel_archdir}_win/compiler"
+          "${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler"
+          )
       elseif(APPLE)
-        get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib" ABSOLUTE)
+        set(_Intel_possible_redistdirs
+          "${_Intel_basedir}/../../compiler/lib"
+          )
       else()
-        if(EXISTS "${_Intel_basedir}/../lib/${_Intel_archdir}_lin")
-          get_filename_component(_Intel_redistdir "${_Intel_basedir}/../lib/${_Intel_archdir}" ABSOLUTE)
-        else()
-          get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib/${_Intel_archdir}_lin" ABSOLUTE)
-        endif()
+        set(_Intel_possible_redistdirs
+          "${_Intel_basedir}/../lib/${_Intel_archdir}"
+          "${_Intel_basedir}/../compiler/lib/${_Intel_archdir}_lin"
+          "${_Intel_basedir}/../../compiler/lib/${_Intel_archdir}_lin"
+          )
       endif()
+
+      set(_Intel_redistdir NOT-FOUND)
+      foreach(dir IN LISTS _Intel_possible_redistdirs)
+        if(EXISTS "${dir}")
+          set(_Intel_redistdir "${dir}")
+          break()
+        endif()
+      endforeach()
+      # Fall back to last dir
+      if(NOT _Intel_redistdir)
+        list(POP_BACK _Intel_possible_redistdirs _Intel_redistdir)
+      endif()
+      unset(_Intel_possible_redistdirs)
       set(_IRSL_HAVE_Intel TRUE)
     endif()
   elseif("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "MSVC")
@@ -222,8 +242,12 @@ if(MSVC)
   set(_MSVC_IDE_VERSION "")
   if(MSVC_VERSION GREATER_EQUAL 2000)
     message(WARNING "MSVC ${MSVC_VERSION} not yet supported.")
-  elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 143)
+  elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 144)
     message(WARNING "MSVC toolset v${MSVC_TOOLSET_VERSION} not yet supported.")
+  elseif(MSVC_TOOLSET_VERSION EQUAL 143)
+    set(MSVC_REDIST_NAME VC143)
+    set(_MSVC_DLL_VERSION 140)
+    set(_MSVC_IDE_VERSION 17)
   elseif(MSVC_TOOLSET_VERSION EQUAL 142)
     set(MSVC_REDIST_NAME VC142)
     set(_MSVC_DLL_VERSION 140)
@@ -264,7 +288,7 @@ if(MSVC)
     if(NOT vs VERSION_LESS 15)
       set(_vs_redist_paths "")
       # The toolset and its redistributables may come with any VS version 15 or newer.
-      set(_MSVC_IDE_VERSIONS 16 15)
+      set(_MSVC_IDE_VERSIONS 17 16 15)
       foreach(_vs_ver ${_MSVC_IDE_VERSIONS})
         set(_vs_glob_redist_paths "")
         cmake_host_system_information(RESULT _vs_dir QUERY VS_${_vs_ver}_DIR) # undocumented query
diff --git a/deps/cmake/share/cmake-3.21/Modules/IntelVSImplicitPath/CMakeLists.txt b/deps/cmake/share/cmake-3.25/Modules/IntelVSImplicitPath/CMakeLists.txt
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/IntelVSImplicitPath/CMakeLists.txt
rename to deps/cmake/share/cmake-3.25/Modules/IntelVSImplicitPath/CMakeLists.txt
diff --git a/deps/cmake/share/cmake-3.21/Modules/IntelVSImplicitPath/detect.cmake b/deps/cmake/share/cmake-3.25/Modules/IntelVSImplicitPath/detect.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/IntelVSImplicitPath/detect.cmake
rename to deps/cmake/share/cmake-3.25/Modules/IntelVSImplicitPath/detect.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/IntelVSImplicitPath/hello.f b/deps/cmake/share/cmake-3.25/Modules/IntelVSImplicitPath/hello.f
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/IntelVSImplicitPath/hello.f
rename to deps/cmake/share/cmake-3.25/Modules/IntelVSImplicitPath/hello.f
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.DS_Store.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.DS_Store.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.DS_Store.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.DS_Store.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.Description.plist.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.Description.plist.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.Description.plist.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.Description.plist.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.Info.plist.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.Info.plist.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.Info.plist.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.Info.plist.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.NuGet.nuspec.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.NuGet.nuspec.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.NuGet.nuspec.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.NuGet.nuspec.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXX11.Info.plist.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.OSXX11.Info.plist.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXX11.Info.plist.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.OSXX11.Info.plist.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXX11.main.scpt.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.OSXX11.main.scpt.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.OSXX11.main.scpt.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.OSXX11.main.scpt.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.RuntimeScript.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.RuntimeScript.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.RuntimeScript.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.RuntimeScript.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.STGZ_Header.sh.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.STGZ_Header.sh.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.VolumeIcon.icns.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.VolumeIcon.icns.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.VolumeIcon.icns.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.VolumeIcon.icns.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.background.png.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.background.png.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPack.background.png.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.background.png.in
diff --git a/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.distribution.dist.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.distribution.dist.in
new file mode 100644
index 00000000..291b24d4
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPack.distribution.dist.in
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<installer-gui-script minSpecVersion="1.0">
+	<title>@CPACK_PACKAGE_NAME@</title>
+	<welcome file="@CPACK_RESOURCE_FILE_WELCOME_NOPATH@"/>
+	<readme file="@CPACK_RESOURCE_FILE_README_NOPATH@"/>
+	<license file="@CPACK_RESOURCE_FILE_LICENSE_NOPATH@"/>
+@CPACK_APPLE_PKG_INSTALLER_CONTENT@
+</installer-gui-script>
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackDeb.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackDeb.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackDeb.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackDeb.cmake
index 967ad7bc..38e32c28 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackDeb.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackDeb.cmake
@@ -37,8 +37,8 @@ endfunction()
 
 #extract library name and version for given shared object
 function(extract_so_info shared_object libname version)
-  if(READELF_EXECUTABLE)
-    execute_process(COMMAND "${READELF_EXECUTABLE}" -d "${shared_object}"
+  if(CPACK_READELF_EXECUTABLE)
+    execute_process(COMMAND "${CPACK_READELF_EXECUTABLE}" -d "${shared_object}"
       WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
       RESULT_VARIABLE result
       OUTPUT_VARIABLE output
@@ -197,15 +197,15 @@ function(cpack_deb_prepare_package_vars)
     endforeach()
   endif()
 
-  find_program(READELF_EXECUTABLE NAMES readelf)
+  find_program(CPACK_READELF_EXECUTABLE NAMES readelf)
 
   if(CPACK_DEBIAN_DEBUGINFO_PACKAGE AND CPACK_DEB_UNSTRIPPED_FILES)
-    find_program(OBJCOPY_EXECUTABLE NAMES objcopy)
+    find_program(CPACK_OBJCOPY_EXECUTABLE NAMES objcopy)
 
-    if(NOT OBJCOPY_EXECUTABLE)
+    if(NOT CPACK_OBJCOPY_EXECUTABLE)
       message(FATAL_ERROR "debuginfo packages require the objcopy tool")
     endif()
-    if(NOT READELF_EXECUTABLE)
+    if(NOT CPACK_READELF_EXECUTABLE)
       message(FATAL_ERROR "debuginfo packages require the readelf tool")
     endif()
 
@@ -213,7 +213,7 @@ function(cpack_deb_prepare_package_vars)
     foreach(_FILE IN LISTS CPACK_DEB_UNSTRIPPED_FILES)
 
       # Get the file's Build ID
-      execute_process(COMMAND env LC_ALL=C ${READELF_EXECUTABLE} -n "${_FILE}"
+      execute_process(COMMAND env LC_ALL=C ${CPACK_READELF_EXECUTABLE} -n "${_FILE}"
         WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
         OUTPUT_VARIABLE READELF_OUTPUT
         RESULT_VARIABLE READELF_RESULT
@@ -221,7 +221,7 @@ function(cpack_deb_prepare_package_vars)
         OUTPUT_STRIP_TRAILING_WHITESPACE )
       if(NOT READELF_RESULT EQUAL 0)
         message(FATAL_ERROR "CPackDeb: readelf: '${READELF_ERROR}';\n"
-            "executed command: '${READELF_EXECUTABLE} -n ${_FILE}'")
+            "executed command: '${CPACK_READELF_EXECUTABLE} -n ${_FILE}'")
       endif()
       if(READELF_OUTPUT MATCHES "Build ID: ([0-9a-zA-Z][0-9a-zA-Z])([0-9a-zA-Z]*)")
         set(_BUILD_ID_START ${CMAKE_MATCH_1})
@@ -235,7 +235,7 @@ function(cpack_deb_prepare_package_vars)
       set(_FILE_DBGSYM ${_DBGSYM_ROOT}/usr/lib/debug/.build-id/${_BUILD_ID_START}/${_BUILD_ID_REMAINING}.debug)
       get_filename_component(_OUT_DIR "${_FILE_DBGSYM}" DIRECTORY)
       file(MAKE_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}/${_OUT_DIR}")
-      execute_process(COMMAND ${OBJCOPY_EXECUTABLE} --only-keep-debug "${_FILE}" "${_FILE_DBGSYM}"
+      execute_process(COMMAND ${CPACK_OBJCOPY_EXECUTABLE} --only-keep-debug "${_FILE}" "${_FILE_DBGSYM}"
         WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
         OUTPUT_VARIABLE OBJCOPY_OUTPUT
         RESULT_VARIABLE OBJCOPY_RESULT
@@ -243,9 +243,9 @@ function(cpack_deb_prepare_package_vars)
         OUTPUT_STRIP_TRAILING_WHITESPACE )
       if(NOT OBJCOPY_RESULT EQUAL 0)
         message(FATAL_ERROR "CPackDeb: objcopy: '${OBJCOPY_ERROR}';\n"
-            "executed command: '${OBJCOPY_EXECUTABLE} --only-keep-debug ${_FILE} ${_FILE_DBGSYM}'")
+            "executed command: '${CPACK_OBJCOPY_EXECUTABLE} --only-keep-debug ${_FILE} ${_FILE_DBGSYM}'")
       endif()
-      execute_process(COMMAND ${OBJCOPY_EXECUTABLE} --strip-unneeded ${_FILE}
+      execute_process(COMMAND ${CPACK_OBJCOPY_EXECUTABLE} --strip-unneeded ${_FILE}
         WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
         OUTPUT_VARIABLE OBJCOPY_OUTPUT
         RESULT_VARIABLE OBJCOPY_RESULT
@@ -253,9 +253,9 @@ function(cpack_deb_prepare_package_vars)
         OUTPUT_STRIP_TRAILING_WHITESPACE )
       if(NOT OBJCOPY_RESULT EQUAL 0)
         message(FATAL_ERROR "CPackDeb: objcopy: '${OBJCOPY_ERROR}';\n"
-            "executed command: '${OBJCOPY_EXECUTABLE} --strip-debug ${_FILE}'")
+            "executed command: '${CPACK_OBJCOPY_EXECUTABLE} --strip-debug ${_FILE}'")
       endif()
-      execute_process(COMMAND ${OBJCOPY_EXECUTABLE} --add-gnu-debuglink=${_FILE_DBGSYM} ${_FILE}
+      execute_process(COMMAND ${CPACK_OBJCOPY_EXECUTABLE} --add-gnu-debuglink=${_FILE_DBGSYM} ${_FILE}
         WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}"
         OUTPUT_VARIABLE OBJCOPY_OUTPUT
         RESULT_VARIABLE OBJCOPY_RESULT
@@ -263,7 +263,7 @@ function(cpack_deb_prepare_package_vars)
         OUTPUT_STRIP_TRAILING_WHITESPACE )
       if(NOT OBJCOPY_RESULT EQUAL 0)
         message(FATAL_ERROR "CPackDeb: objcopy: '${OBJCOPY_ERROR}';\n"
-            "executed command: '${OBJCOPY_EXECUTABLE} --add-gnu-debuglink=${_FILE_DBGSYM} ${_FILE}'")
+            "executed command: '${CPACK_OBJCOPY_EXECUTABLE} --add-gnu-debuglink=${_FILE_DBGSYM} ${_FILE}'")
       endif()
     endforeach()
   endif()
@@ -332,6 +332,14 @@ function(cpack_deb_prepare_package_vars)
           RESULT_VARIABLE SHLIBDEPS_RESULT
           ERROR_VARIABLE SHLIBDEPS_ERROR
           OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+        # E2K OSL 6.0.1 and prior has broken dpkg-shlibdeps. CPack will deal with that (mocking SHLIBDEPS_OUTPUT), but inform user of this.
+        if("${SHLIBDEPS_ERROR}" MATCHES "unknown gcc system type e2k.*, falling back to default")
+          message(WARNING "CPackDeb: broken dpkg-shlibdeps on E2K detected, will fall back to minimal dependencies.\n"
+                  "You should expect that dependencies list in the package will be incomplete.")
+          set(SHLIBDEPS_OUTPUT "shlibs:Depends=libc6, lcc-libs")
+        endif()
+
         if(CPACK_DEBIAN_PACKAGE_DEBUG)
           # dpkg-shlibdeps will throw some warnings if some input files are not binary
           message( "CPackDeb Debug: dpkg-shlibdeps warnings \n${SHLIBDEPS_ERROR}")
@@ -644,7 +652,7 @@ function(cpack_deb_prepare_package_vars)
   unset(CPACK_DEBIAN_PACKAGE_SHLIBS_LIST)
 
   if(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS)
-    if(READELF_EXECUTABLE)
+    if(CPACK_READELF_EXECUTABLE)
       foreach(_FILE IN LISTS CPACK_DEB_SHARED_OBJECT_FILES)
         extract_so_info("${_FILE}" libname soversion)
         if(libname AND DEFINED soversion)
@@ -662,10 +670,12 @@ function(cpack_deb_prepare_package_vars)
 
   # add ldconfig call in default postrm and postint
   set(CPACK_ADD_LDCONFIG_CALL 0)
+  # all files in CPACK_DEB_SHARED_OBJECT_FILES have dot at the beginning
+  set(_LDCONF_DEFAULTS "./lib" "./usr/lib")
   foreach(_FILE IN LISTS CPACK_DEB_SHARED_OBJECT_FILES)
     get_filename_component(_DIR ${_FILE} DIRECTORY)
-    # all files in CPACK_DEB_SHARED_OBJECT_FILES have dot at the beginning
-    if(_DIR STREQUAL "./lib" OR _DIR STREQUAL "./usr/lib")
+    get_filename_component(_PARENT_DIR ${_DIR} DIRECTORY)
+    if(_DIR IN_LIST _LDCONF_DEFAULTS OR _PARENT_DIR IN_LIST _LDCONF_DEFAULTS)
       set(CPACK_ADD_LDCONFIG_CALL 1)
     endif()
   endforeach()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackExternal.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackExternal.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackExternal.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackExternal.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackFreeBSD.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackFreeBSD.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackFreeBSD.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackFreeBSD.cmake
index ae405320..c35089cb 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackFreeBSD.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackFreeBSD.cmake
@@ -34,7 +34,7 @@ function(_cpack_freebsd_fallback_var OUTPUT_VAR_NAME)
     endif()
   endforeach()
   if(NOT VALUE)
-    message(WARNING "Variable ${OUTPUT_VAR_NAME} could not be given a fallback value from any variable ${FALLBACK_VAR_NAMES}.")
+    message(WARNING "Variable ${OUTPUT_VAR_NAME} could not be given a fallback value from (any of) ${FALLBACK_VAR_NAMES}.")
   endif()
 endfunction()
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackNuGet.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackNuGet.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackNuGet.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackNuGet.cmake
index fb363f44..056d025e 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackNuGet.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackNuGet.cmake
@@ -332,7 +332,9 @@ endfunction()
 function(_cpack_nuget_make_files_tag)
     set(_files)
     foreach(_comp IN LISTS ARGN)
-        string(APPEND _files "        <file src=\"${_comp}/**\" target=\".\" />\n")
+        cmake_path(APPEND _comp "**")
+        cmake_path(NATIVE_PATH _comp _comp)
+        string(APPEND _files "        <file src=\"${_comp}\" target=\".\" />\n")
     endforeach()
     set(_CPACK_NUGET_FILES_TAG "<files>\n${_files}    </files>" PARENT_SCOPE)
 endfunction()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackRPM.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackRPM.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackRPM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackRPM.cmake
index 47d2a5c7..7c10280a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackRPM.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackRPM.cmake
@@ -11,9 +11,7 @@ function(set_spec_script_if_enabled TYPE PACKAGE_NAME VAR)
     if(PACKAGE_NAME)
       set(PACKAGE_NAME " -n ${PACKAGE_NAME}")
     endif()
-    set(${TYPE}_
-      "%${TYPE}${PACKAGE_NAME}\n"
-      "${VAR}\n" PARENT_SCOPE)
+    set(${TYPE}_ "%${TYPE}${PACKAGE_NAME}\n${VAR}\n" PARENT_SCOPE)
   else()
     set(${TYPE} "" PARENT_SCOPE)
   endif()
@@ -627,8 +625,8 @@ function(cpack_rpm_debugsymbol_check INSTALL_FILES WORKING_DIR)
   endif()
 
   # With objdump we should check the debug symbols
-  find_program(OBJDUMP_EXECUTABLE objdump)
-  if(NOT OBJDUMP_EXECUTABLE)
+  find_program(CPACK_OBJDUMP_EXECUTABLE objdump)
+  if(NOT CPACK_OBJDUMP_EXECUTABLE)
     message(FATAL_ERROR "CPackRPM: objdump binary could not be found!"
       " Required for debuginfo packaging. See documentation of"
       " CPACK_RPM_DEBUGINFO_PACKAGE variable for details.")
@@ -651,7 +649,7 @@ function(cpack_rpm_debugsymbol_check INSTALL_FILES WORKING_DIR)
       continue()
     endif()
 
-    execute_process(COMMAND "${OBJDUMP_EXECUTABLE}" -h ${WORKING_DIR}/${F}
+    execute_process(COMMAND "${CPACK_OBJDUMP_EXECUTABLE}" -h ${WORKING_DIR}/${F}
                     WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}"
                     RESULT_VARIABLE OBJDUMP_EXEC_RESULT
                     OUTPUT_VARIABLE OBJDUMP_OUT
@@ -792,7 +790,7 @@ function(cpack_rpm_variable_fallback OUTPUT_VAR_NAME)
   set(FALLBACK_VAR_NAMES ${ARGN})
 
   foreach(variable_name IN LISTS FALLBACK_VAR_NAMES)
-    if(${variable_name})
+    if(DEFINED ${variable_name})
       set(${OUTPUT_VAR_NAME} "${${variable_name}}" PARENT_SCOPE)
       break()
     endif()
@@ -1162,6 +1160,16 @@ function(cpack_rpm_generate_package)
     set(TMP_RPM_SPEC_INSTALL_POST "%define __spec_install_post ${CPACK_RPM_SPEC_INSTALL_POST}")
   endif()
 
+  # CPACK_RPM_REQUIRES_EXCLUDE_FROM
+  # May be defined to keep the dependency generator from
+  # scanning specific files or directories for deps.
+  if(CPACK_RPM_REQUIRES_EXCLUDE_FROM)
+    if(CPACK_RPM_PACKAGE_DEBUG)
+      message("CPackRPM:Debug: User defined CPACK_RPM_REQUIRES_EXCLUDE_FROM = ${CPACK_RPM_REQUIRES_EXCLUDE_FROM}")
+    endif()
+    set(TMP_RPM_REQUIRES_EXCLUDE_FROM "%global __requires_exclude_from ${CPACK_RPM_REQUIRES_EXCLUDE_FROM}")
+  endif()
+
   # CPACK_RPM_POST_INSTALL_SCRIPT_FILE (or CPACK_RPM_<COMPONENT>_POST_INSTALL_SCRIPT_FILE)
   # CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE (or CPACK_RPM_<COMPONENT>_POST_UNINSTALL_SCRIPT_FILE)
   # CPACK_RPM_POST_TRANS_SCRIPT_FILE (or CPACK_RPM_<COMPONENT>_POST_TRANS_SCRIPT_FILE)
@@ -1650,6 +1658,7 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
 \@FILE_NAME_DEFINE\@
 %define _unpackaged_files_terminate_build 0
 \@TMP_RPM_SPEC_INSTALL_POST\@
+\@TMP_RPM_REQUIRES_EXCLUDE_FROM\@
 \@CPACK_RPM_SPEC_MORE_DEFINE\@
 \@CPACK_RPM_COMPRESSION_TYPE_TMP\@
 
@@ -1784,6 +1793,7 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
 \@FILE_NAME_DEFINE\@
 %define _unpackaged_files_terminate_build 0
 \@TMP_RPM_SPEC_INSTALL_POST\@
+\@TMP_RPM_REQUIRES_EXCLUDE_FROM\@
 \@CPACK_RPM_SPEC_MORE_DEFINE\@
 \@CPACK_RPM_COMPRESSION_TYPE_TMP\@
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackWIX.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackWIX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackWIX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackWIX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackZIP.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackZIP.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/CPackZIP.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/CPackZIP.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/NSIS.InstallOptions.ini.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/NSIS.InstallOptions.ini.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/NSIS.InstallOptions.ini.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/NSIS.InstallOptions.ini.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/NSIS.template.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/NSIS.template.in
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/NSIS.template.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/NSIS.template.in
index 0a9c4877..21753afe 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/NSIS.template.in
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/NSIS.template.in
@@ -48,7 +48,7 @@
 
 ;--- Component support macros: ---
 ; The code for the add/remove functionality is from:
-;   http://nsis.sourceforge.net/Add/Remove_Functionality
+;   https://nsis.sourceforge.io/Add/Remove_Functionality
 ; It has been modified slightly and extended to provide
 ; inter-component dependencies.
 Var AR_SecFlags
@@ -383,7 +383,7 @@ Function un.RemoveFromPath
 FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
+; Uninstall stuff
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ###########################################
@@ -487,15 +487,15 @@ Done:
 	Exch $R1
 FunctionEnd
 
-Function ConditionalAddToRegisty
+Function ConditionalAddToRegistry
   Pop $0
   Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+  StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
     WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" \
     "$1" "$0"
     ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
     DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
+  ConditionalAddToRegistry_EmptyString:
 FunctionEnd
 
 ;--------------------------------
@@ -531,7 +531,6 @@ FunctionEnd
 @CPACK_NSIS_INSTALLER_ICON_CODE@
 @CPACK_NSIS_INSTALLER_MUI_WELCOMEFINISH_CODE@
 @CPACK_NSIS_INSTALLER_MUI_UNWELCOMEFINISH_CODE@
-@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
 @CPACK_NSIS_INSTALLER_MUI_FINISHPAGE_RUN_CODE@
 
 ;--------------------------------
@@ -540,7 +539,7 @@ FunctionEnd
   @CPACK_NSIS_INSTALLER_WELCOME_TITLE_3LINES_CODE@
   !insertmacro MUI_PAGE_WELCOME
 
-  !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
+  @CPACK_NSIS_LICENSE_PAGE@
   Page custom InstallOptionsPage
   !insertmacro MUI_PAGE_DIRECTORY
 
@@ -564,21 +563,27 @@ FunctionEnd
 ;Languages
 
   !insertmacro MUI_LANGUAGE "English" ;first language is the default language
+  !insertmacro MUI_LANGUAGE "Afrikaans"
   !insertmacro MUI_LANGUAGE "Albanian"
   !insertmacro MUI_LANGUAGE "Arabic"
+  !insertmacro MUI_LANGUAGE "Asturian"
   !insertmacro MUI_LANGUAGE "Basque"
   !insertmacro MUI_LANGUAGE "Belarusian"
   !insertmacro MUI_LANGUAGE "Bosnian"
   !insertmacro MUI_LANGUAGE "Breton"
   !insertmacro MUI_LANGUAGE "Bulgarian"
+  !insertmacro MUI_LANGUAGE "Catalan"
+  !insertmacro MUI_LANGUAGE "Corsican"
   !insertmacro MUI_LANGUAGE "Croatian"
   !insertmacro MUI_LANGUAGE "Czech"
   !insertmacro MUI_LANGUAGE "Danish"
   !insertmacro MUI_LANGUAGE "Dutch"
+  !insertmacro MUI_LANGUAGE "Esperanto"
   !insertmacro MUI_LANGUAGE "Estonian"
   !insertmacro MUI_LANGUAGE "Farsi"
   !insertmacro MUI_LANGUAGE "Finnish"
   !insertmacro MUI_LANGUAGE "French"
+  !insertmacro MUI_LANGUAGE "Galician"
   !insertmacro MUI_LANGUAGE "German"
   !insertmacro MUI_LANGUAGE "Greek"
   !insertmacro MUI_LANGUAGE "Hebrew"
@@ -597,22 +602,29 @@ FunctionEnd
   !insertmacro MUI_LANGUAGE "Malay"
   !insertmacro MUI_LANGUAGE "Mongolian"
   !insertmacro MUI_LANGUAGE "Norwegian"
+  !insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+  !insertmacro MUI_LANGUAGE "Pashto"
   !insertmacro MUI_LANGUAGE "Polish"
   !insertmacro MUI_LANGUAGE "Portuguese"
   !insertmacro MUI_LANGUAGE "PortugueseBR"
   !insertmacro MUI_LANGUAGE "Romanian"
   !insertmacro MUI_LANGUAGE "Russian"
+  !insertmacro MUI_LANGUAGE "ScotsGaelic"
   !insertmacro MUI_LANGUAGE "Serbian"
   !insertmacro MUI_LANGUAGE "SerbianLatin"
   !insertmacro MUI_LANGUAGE "SimpChinese"
   !insertmacro MUI_LANGUAGE "Slovak"
   !insertmacro MUI_LANGUAGE "Slovenian"
   !insertmacro MUI_LANGUAGE "Spanish"
+  !insertmacro MUI_LANGUAGE "SpanishInternational"
   !insertmacro MUI_LANGUAGE "Swedish"
+  !insertmacro MUI_LANGUAGE "Tatar"
   !insertmacro MUI_LANGUAGE "Thai"
   !insertmacro MUI_LANGUAGE "TradChinese"
   !insertmacro MUI_LANGUAGE "Turkish"
   !insertmacro MUI_LANGUAGE "Ukrainian"
+  !insertmacro MUI_LANGUAGE "Uzbek"
+  !insertmacro MUI_LANGUAGE "Vietnamese"
   !insertmacro MUI_LANGUAGE "Welsh"
 
 ;--------------------------------
@@ -635,7 +647,7 @@ FunctionEnd
 ;--------------------------------
 ; Component sections
 @CPACK_NSIS_COMPONENT_SECTIONS@
-
+@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
 ;--------------------------------
 ;Installer Sections
 
@@ -653,44 +665,44 @@ Section "-Core installation"
   WriteUninstaller "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"
   Push "DisplayName"
   Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DisplayVersion"
   Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Publisher"
   Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "UninstallString"
-  Push "$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe"
-  Call ConditionalAddToRegisty
+  Push "$\"$INSTDIR\@CPACK_NSIS_UNINSTALL_NAME@.exe$\""
+  Call ConditionalAddToRegistry
   Push "NoRepair"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
   !ifdef CPACK_NSIS_ADD_REMOVE
   ;Create add/remove functionality
   Push "ModifyPath"
   Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !else
   Push "NoModify"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !endif
 
   ; Optional registration
   Push "DisplayIcon"
   Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "HelpLink"
   Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "URLInfoAbout"
   Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Contact"
   Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 
@@ -708,19 +720,19 @@ Section "-Core installation"
   ; Write special uninstall registry entries
   Push "StartMenu"
   Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DoNotAddToPath"
   Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathAllUsers"
   Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathCurrentUser"
   Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "InstallToDesktop"
   Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
   !insertmacro MUI_STARTMENU_WRITE_END
 
@@ -868,7 +880,7 @@ Section "Uninstall"
     StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
   startMenuDeleteLoopDone:
 
-  ; If the user changed the shortcut, then untinstall may not work. This should
+  ; If the user changed the shortcut, then uninstall may not work. This should
   ; try to fix it.
   StrCpy $MUI_TEMP "$START_MENU"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
@@ -919,6 +931,17 @@ Function .onInit
 ;Run the uninstaller
 uninst:
   ClearErrors
+  # $0 should _always_ be quoted, however older versions of CMake did not
+  # do this.  We'll conditionally remove the begin/end quotes.
+  # Remove first char if quote
+  StrCpy $2 $0 1 0      # copy first char
+  StrCmp $2 "$\"" 0 +2  # if char is quote
+  StrCpy $0 $0 "" 1     # remove first char
+  # Remove last char if quote
+  StrCpy $2 $0 1 -1     # copy last char
+  StrCmp $2 "$\"" 0 +2  # if char is quote
+  StrCpy $0 $0 -1       # remove last char
+
   StrLen $2 "\@CPACK_NSIS_UNINSTALL_NAME@.exe"
   StrCpy $3 $0 -$2 # remove "\@CPACK_NSIS_UNINSTALL_NAME@.exe" from UninstallString to get path
   ExecWait '"$0" /S _?=$3' ;Do not copy the uninstaller to a temp file
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CPack/WIX.template.in b/deps/cmake/share/cmake-3.25/Modules/Internal/CPack/WIX.template.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CPack/WIX.template.in
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CPack/WIX.template.in
diff --git a/deps/cmake/share/cmake-3.25/Modules/Internal/CheckCompilerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckCompilerFlag.cmake
new file mode 100644
index 00000000..910f426f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckCompilerFlag.cmake
@@ -0,0 +1,31 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+include_guard(GLOBAL)
+include(Internal/CheckFlagCommonConfig)
+include(Internal/CheckSourceCompiles)
+include(CMakeCheckCompilerFlagCommonPatterns)
+
+function(CMAKE_CHECK_COMPILER_FLAG _lang _flag _var)
+  # Parse extra arguments
+  cmake_parse_arguments(PARSE_ARGV 3 CHECK_COMPILER_FLAG "" "OUTPUT_VARIABLE" "")
+
+  cmake_check_flag_common_init("check_compiler_flag" ${_lang} _lang_src _lang_fail_regex)
+
+  set(CMAKE_REQUIRED_DEFINITIONS ${_flag})
+
+  check_compiler_flag_common_patterns(_common_patterns)
+  cmake_check_source_compiles(${_lang}
+    "${_lang_src}"
+    ${_var}
+    ${_lang_fail_regex}
+    ${_common_patterns}
+    OUTPUT_VARIABLE _output
+    )
+
+  if (CHECK_COMPILER_FLAG_OUTPUT_VARIABLE)
+    set(${CHECK_COMPILER_FLAG_OUTPUT_VARIABLE} "${_output}" PARENT_SCOPE)
+  endif()
+
+  cmake_check_flag_common_finish()
+endfunction()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Internal/CheckFlagCommonConfig.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckFlagCommonConfig.cmake
new file mode 100644
index 00000000..c011c242
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckFlagCommonConfig.cmake
@@ -0,0 +1,75 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# Do NOT include this module directly into any of your code. It is meant as
+# a library for Check*CompilerFlag.cmake and Check*LinkerFlag.cma modules.
+# It's content may change in any way between releases.
+
+include_guard(GLOBAL)
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
+cmake_policy(SET CMP0057 NEW) # if() supports IN_LIST
+
+macro(CMAKE_CHECK_FLAG_COMMON_INIT _FUNC _LANG _SRC _PATTERNS)
+  if("${_LANG}" STREQUAL "C")
+    set(${_SRC} "int main(void) { return 0; }")
+    set(${_PATTERNS} FAIL_REGEX "command[ -]line option .* is valid for .* but not for C"
+      FAIL_REGEX "-Werror=.* argument .* is not valid for C")
+  elseif("${_LANG}" STREQUAL "CXX")
+    set(${_SRC} "int main() { return 0; }")
+    set(${_PATTERNS} FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+"
+      FAIL_REGEX "-Werror=.* argument .* is not valid for C\\+\\+")
+  elseif("${_LANG}" STREQUAL "CUDA")
+    set(${_SRC} "__host__ int main() { return 0; }")
+    set(${_PATTERNS} FAIL_REGEX "command[ -]line option .* is valid for .* but not for C\\+\\+" # Host GNU
+      FAIL_REGEX "argument unused during compilation: .*") # Clang
+  elseif("${_LANG}" STREQUAL "Fortran")
+    set(${_SRC} "       program test\n       stop\n       end program")
+    set(${_PATTERNS} FAIL_REGEX "command[ -]line option .* is valid for .* but not for Fortran")
+  elseif("${_LANG}" STREQUAL "HIP")
+    set(${_SRC} "__host__ int main() { return 0; }")
+    set(${_PATTERNS} FAIL_REGEX "argument unused during compilation: .*") # Clang
+  elseif("${_LANG}" STREQUAL "OBJC")
+    set(${_SRC} [=[
+      #ifndef __OBJC__
+      #  error "Not an Objective-C compiler"
+      #endif
+      int main(void) { return 0; }]=])
+    set(${_PATTERNS} FAIL_REGEX "command[ -]line option .* is valid for .* but not for Objective-C" # GNU
+      FAIL_REGEX "argument unused during compilation: .*") # Clang
+  elseif("${_LANG}" STREQUAL "OBJCXX")
+    set(${_SRC} [=[
+      #ifndef __OBJC__
+      #  error "Not an Objective-C++ compiler"
+      #endif
+      int main(void) { return 0; }]=])
+    set(${_PATTERNS} FAIL_REGEX "command[ -]line option .* is valid for .* but not for Objective-C\\+\\+" # GNU
+      FAIL_REGEX "argument unused during compilation: .*") # Clang
+  elseif("${_LANG}" STREQUAL "ISPC")
+    set(${_SRC} "float func(uniform int32, float a) { return a / 2.25; }")
+  else()
+    message (SEND_ERROR "${_FUNC}: ${_LANG}: unknown language.")
+    return()
+  endif()
+
+  get_property (_supported_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
+  if (NOT "${_LANG}" IN_LIST _supported_languages)
+    message (SEND_ERROR "${_FUNC}: ${_LANG}: needs to be enabled before use.")
+    return()
+  endif()
+  # Normalize locale during test compilation.
+  set(_CFCC_locale_vars LC_ALL LC_MESSAGES LANG)
+  foreach(v IN LISTS _CFCC_locale_vars)
+    set(_CMAKE_CHECK_FLAG_COMMON_CONFIG_locale_vars_saved_${v} "$ENV{${v}}")
+    set(ENV{${v}} C)
+  endforeach()
+endmacro()
+
+macro(CMAKE_CHECK_FLAG_COMMON_FINISH)
+  foreach(v IN LISTS _CFCC_locale_vars)
+    set(ENV{${v}} ${_CMAKE_CHECK_FLAG_COMMON_CONFIG_locale_vars_saved_${v}})
+  endforeach()
+endmacro()
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Internal/CheckLinkerFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckLinkerFlag.cmake
new file mode 100644
index 00000000..76131055
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckLinkerFlag.cmake
@@ -0,0 +1,52 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+include_guard(GLOBAL)
+include(Internal/CheckFlagCommonConfig)
+include(Internal/CheckSourceCompiles)
+include(CMakeCheckCompilerFlagCommonPatterns)
+
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
+
+function(CMAKE_CHECK_LINKER_FLAG _lang _flag _var)
+  # link step supports less languages than the compiler
+  # so do a first check about the requested language
+  if (_lang STREQUAL "ISPC")
+    message (SEND_ERROR "check_linker_flag: ${_lang}: unsupported language.")
+    return()
+  endif()
+
+  # Parse extra arguments
+  cmake_parse_arguments(PARSE_ARGV 3 CHECK_LINKER_FLAG "" "OUTPUT_VARIABLE" "")
+
+  cmake_check_flag_common_init("check_linker_flag" ${_lang} _lang_src _lang_fail_regex)
+
+  set(CMAKE_REQUIRED_LINK_OPTIONS "${_flag}")
+
+  check_compiler_flag_common_patterns(_common_patterns)
+
+  # Match linker warnings if the exact flag is ignored.
+  foreach(flag IN LISTS _flag)
+    string(REGEX REPLACE "([][+.*?()^$])" [[\\\1]] _flag_regex "${flag}")
+    list(APPEND _common_patterns
+      FAIL_REGEX "warning: .*${_flag_regex}.* ignored"
+      )
+  endforeach()
+
+  cmake_check_source_compiles(${_lang}
+    "${_lang_src}"
+    ${_var}
+    ${_lang_fail_regex}
+    ${_common_patterns}
+    OUTPUT_VARIABLE _output
+    )
+
+  if (CHECK_LINKER_FLAG_OUTPUT_VARIABLE)
+    set(${CHECK_LINKER_FLAG_OUTPUT_VARIABLE} "${_output}" PARENT_SCOPE)
+  endif()
+
+  cmake_check_flag_common_finish()
+endfunction()
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CheckSourceCompiles.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckSourceCompiles.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CheckSourceCompiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CheckSourceCompiles.cmake
index 8c3a4186..eadf3da5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CheckSourceCompiles.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckSourceCompiles.cmake
@@ -49,13 +49,16 @@ function(CMAKE_CHECK_SOURCE_COMPILES _lang _source _var)
     set(_SRC_EXT)
     set(_key)
     foreach(arg ${ARGN})
-      if("${arg}" MATCHES "^(FAIL_REGEX|SRC_EXT)$")
+      if("${arg}" MATCHES "^(FAIL_REGEX|SRC_EXT|OUTPUT_VARIABLE)$")
         set(_key "${arg}")
       elseif(_key STREQUAL "FAIL_REGEX")
         list(APPEND _FAIL_REGEX "${arg}")
       elseif(_key STREQUAL "SRC_EXT")
         set(_SRC_EXT "${arg}")
         set(_key "")
+      elseif(_key STREQUAL "OUTPUT_VARIABLE")
+        set(_OUTPUT_VARIABLE "${arg}")
+        set(_key "")
       else()
         message(FATAL_ERROR "Unknown argument:\n  ${arg}\n")
       endif()
@@ -83,15 +86,13 @@ function(CMAKE_CHECK_SOURCE_COMPILES _lang _source _var)
     else()
       set(CHECK_${LANG}_SOURCE_COMPILES_ADD_INCLUDES)
     endif()
-    file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT}"
-      "${_source}\n")
 
     if(NOT CMAKE_REQUIRED_QUIET)
       message(CHECK_START "Performing Test ${_var}")
     endif()
+    string(APPEND _source "\n")
     try_compile(${_var}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT}
+      SOURCE_FROM_VAR "src.${_SRC_EXT}" _source
       COMPILE_DEFINITIONS -D${_var} ${CMAKE_REQUIRED_DEFINITIONS}
       ${CHECK_${LANG}_SOURCE_COMPILES_ADD_LINK_OPTIONS}
       ${CHECK_${LANG}_SOURCE_COMPILES_ADD_LIBRARIES}
@@ -105,6 +106,10 @@ function(CMAKE_CHECK_SOURCE_COMPILES _lang _source _var)
       endif()
     endforeach()
 
+    if (_OUTPUT_VARIABLE)
+      set(${_OUTPUT_VARIABLE} "${OUTPUT}" PARENT_SCOPE)
+    endif()
+
     if(${_var})
       set(${_var} 1 CACHE INTERNAL "Test ${_var}")
       if(NOT CMAKE_REQUIRED_QUIET)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/CheckSourceRuns.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckSourceRuns.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/CheckSourceRuns.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/CheckSourceRuns.cmake
index 75e98960..09c85c5d 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/CheckSourceRuns.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/CheckSourceRuns.cmake
@@ -85,15 +85,13 @@ function(CMAKE_CHECK_SOURCE_RUNS _lang _source _var)
     else()
       set(CHECK_${_lang}_SOURCE_COMPILES_ADD_INCLUDES)
     endif()
-    file(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT}"
-      "${_source}\n")
 
     if(NOT CMAKE_REQUIRED_QUIET)
       message(CHECK_START "Performing Test ${_var}")
     endif()
+    string(APPEND _source "\n")
     try_run(${_var}_EXITCODE ${_var}_COMPILED
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.${_SRC_EXT}
+      SOURCE_FROM_VAR "src.${_SRC_EXT}" _source
       COMPILE_DEFINITIONS -D${_var} ${CMAKE_REQUIRED_DEFINITIONS}
       ${CHECK_${_lang}_SOURCE_COMPILES_ADD_LINK_OPTIONS}
       ${CHECK_${_lang}_SOURCE_COMPILES_ADD_LIBRARIES}
diff --git a/deps/cmake/share/cmake-3.21/Modules/Internal/FeatureTesting.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/FeatureTesting.cmake
similarity index 93%
rename from deps/cmake/share/cmake-3.21/Modules/Internal/FeatureTesting.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Internal/FeatureTesting.cmake
index b6f3c091..5c144ec5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Internal/FeatureTesting.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/FeatureTesting.cmake
@@ -4,7 +4,7 @@ macro(_record_compiler_features lang compile_flags feature_list)
 
   string(TOLOWER ${lang} lang_lc)
   file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.bin")
-  file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}" "
+  set(_content "
   const char features[] = {\"\\n\"\n")
 
   get_property(known_features GLOBAL PROPERTY CMAKE_${lang}_KNOWN_FEATURES)
@@ -16,10 +16,11 @@ macro(_record_compiler_features lang compile_flags feature_list)
       else()
         set(_feature_condition "#if ${_cmake_feature_test_${feature}}\n\"1\"\n#else\n\"0\"\n#endif\n")
       endif()
-      file(APPEND "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}" "\"${lang}_FEATURE:\"\n${_feature_condition}\"${feature}\\n\"\n")
+      string(APPEND _content
+        "\"${lang}_FEATURE:\"\n${_feature_condition}\"${feature}\\n\"\n")
     endif()
   endforeach()
-  file(APPEND "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"
+  string(APPEND _content
     "\n};\n\nint main(int argc, char** argv) { (void)argv; return features[argc]; }\n")
 
   if(CMAKE_${lang}_LINK_WITH_STANDARD_COMPILE_OPTION)
@@ -31,7 +32,7 @@ macro(_record_compiler_features lang compile_flags feature_list)
   endif()
 
   try_compile(CMAKE_${lang}_FEATURE_TEST
-    ${CMAKE_BINARY_DIR} "${CMAKE_BINARY_DIR}/CMakeFiles/feature_tests.${lang_lc}"
+    SOURCE_FROM_VAR "feature_tests.${lang_lc}" _content
     COMPILE_DEFINITIONS "${compile_flags}"
     LINK_LIBRARIES "${compile_flags_for_link}"
     OUTPUT_VARIABLE _output
diff --git a/deps/cmake/share/cmake-3.25/Modules/Internal/HeaderpadWorkaround.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/HeaderpadWorkaround.cmake
new file mode 100644
index 00000000..9a7f9f57
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/HeaderpadWorkaround.cmake
@@ -0,0 +1,69 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# Do NOT include this module directly into any of your code. It is used by
+# the try_compile() implementation to work around a specific issue with
+# conflicting flags when building for Apple platforms.
+if(NOT APPLE)
+  return()
+endif()
+
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
+
+function(__cmake_internal_workaround_headerpad_flag_conflict _LANG)
+
+  # Until we can avoid hard-coding -Wl,-headerpad_max_install_names in the
+  # linker flags, we need to remove it here for cases where we know it will
+  # conflict with other flags, generate a warning and be ignored.
+  set(regex "(^| )(-fembed-bitcode(-marker|=(all|bitcode|marker))?|-bundle_bitcode)($| )")
+  set(remove_headerpad NO)
+
+  # Check arbitrary flags that the user or project has set. These compiler
+  # flags get added to the linker command line.
+  if("${CMAKE_${_LANG}_FLAGS}" MATCHES "${regex}")
+    set(remove_headerpad YES)
+  endif()
+  if(NOT remove_headerpad)
+    get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    if(is_multi_config)
+      # Only one of these config-specific variables will be set by try_compile()
+      # and the rest will be unset, but we can't easily tell which one is set.
+      # No harm to just add them all here, empty ones won't add flags to check.
+      foreach(config IN LISTS CMAKE_CONFIGURATION_TYPES)
+        if("${CMAKE_${_LANG}_FLAGS_${config}}" MATCHES "${regex}")
+          set(remove_headerpad YES)
+          break()
+        endif()
+      endforeach()
+    else()
+      if("${CMAKE_${_LANG}_FLAGS_${CMAKE_BUILD_TYPE}}" MATCHES "${regex}")
+        set(remove_headerpad YES)
+      endif()
+    endif()
+  endif()
+
+  # The try_compile() command passes compiler flags to check in a way that
+  # results in them being added to add_definitions(). Those don't end up on
+  # the linker command line, so we don't need to check them here.
+
+  if(remove_headerpad)
+    foreach(flag IN ITEMS
+      CMAKE_${_LANG}_LINK_FLAGS
+      CMAKE_SHARED_LIBRARY_CREATE_${_LANG}_FLAGS
+      CMAKE_SHARED_MODULE_CREATE_${_LANG}_FLAGS)
+      string(REPLACE "-Wl,-headerpad_max_install_names" "" ${flag} "${${flag}}")
+      set(${flag} "${${flag}}" PARENT_SCOPE)
+    endforeach()
+  endif()
+endfunction()
+
+get_property(__enabled_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
+foreach(__lang IN LISTS __enabled_languages)
+  __cmake_internal_workaround_headerpad_flag_conflict(${__lang})
+endforeach()
+unset(__lang)
+unset(__enabled_languages)
+
+cmake_policy(POP)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Internal/OSRelease/010-TryOldCentOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/OSRelease/010-TryOldCentOS.cmake
new file mode 100644
index 00000000..ff358977
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/OSRelease/010-TryOldCentOS.cmake
@@ -0,0 +1,41 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# Author: Alex Turbov
+
+if(NOT EXISTS "${CMAKE_SYSROOT}/etc/centos-release")
+  return()
+endif()
+
+# Get the first string only
+file(
+    STRINGS "${CMAKE_SYSROOT}/etc/centos-release" CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT
+    LIMIT_COUNT 1
+  )
+
+#
+# Example:
+#   CentOS release 6.10 (Final)
+#
+if(CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT MATCHES "CentOS release ([0-9\.]+) .*")
+
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_NAME CentOS)
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_PRETTY_NAME "${CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT}")
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_ID centos)
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_ID_LIKE rhel)
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION ${CMAKE_MATCH_1})
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION_ID ${CMAKE_MATCH_1})
+
+  list(
+      APPEND CMAKE_GET_OS_RELEASE_FALLBACK_RESULT
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_NAME
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_PRETTY_NAME
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_ID
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_ID_LIKE
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION_ID
+    )
+
+endif()
+
+unset(CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Internal/OSRelease/020-TryDebianVersion.cmake b/deps/cmake/share/cmake-3.25/Modules/Internal/OSRelease/020-TryDebianVersion.cmake
new file mode 100644
index 00000000..8ebe19a7
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Internal/OSRelease/020-TryDebianVersion.cmake
@@ -0,0 +1,38 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# Author: Alex Turbov
+
+if(NOT EXISTS "${CMAKE_SYSROOT}/etc/debian_version")
+  return()
+endif()
+
+# Get the first string only
+file(
+    STRINGS "${CMAKE_SYSROOT}/etc/debian_version" CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT
+    LIMIT_COUNT 1
+  )
+
+#
+# Example:
+#   6.0.10          # Old debian
+#   wheezy/sid      # Ubuntu
+#
+if(CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT MATCHES "[0-9]+(\.[0-9]+)*")
+
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_NAME Debian)
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_ID debian)
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION ${CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT})
+  set(CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION_ID ${CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT})
+
+  list(
+      APPEND CMAKE_GET_OS_RELEASE_FALLBACK_RESULT
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_NAME
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_ID
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION
+      CMAKE_GET_OS_RELEASE_FALLBACK_RESULT_VERSION_ID
+    )
+
+endif()
+
+unset(CMAKE_GET_OS_RELEASE_FALLBACK_CONTENT)
diff --git a/deps/cmake/share/cmake-3.21/Modules/KDE3Macros.cmake b/deps/cmake/share/cmake-3.25/Modules/KDE3Macros.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/KDE3Macros.cmake
rename to deps/cmake/share/cmake-3.25/Modules/KDE3Macros.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/MacOSXBundleInfo.plist.in b/deps/cmake/share/cmake-3.25/Modules/MacOSXBundleInfo.plist.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/MacOSXBundleInfo.plist.in
rename to deps/cmake/share/cmake-3.25/Modules/MacOSXBundleInfo.plist.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/MacOSXFrameworkInfo.plist.in b/deps/cmake/share/cmake-3.25/Modules/MacOSXFrameworkInfo.plist.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/MacOSXFrameworkInfo.plist.in
rename to deps/cmake/share/cmake-3.25/Modules/MacOSXFrameworkInfo.plist.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/MacroAddFileDependencies.cmake b/deps/cmake/share/cmake-3.25/Modules/MacroAddFileDependencies.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/MacroAddFileDependencies.cmake
rename to deps/cmake/share/cmake-3.25/Modules/MacroAddFileDependencies.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/MatlabTestsRedirect.cmake b/deps/cmake/share/cmake-3.25/Modules/MatlabTestsRedirect.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/MatlabTestsRedirect.cmake
rename to deps/cmake/share/cmake-3.25/Modules/MatlabTestsRedirect.cmake
index fc36fc3b..d651cddd 100644
--- a/deps/cmake/share/cmake-3.21/Modules/MatlabTestsRedirect.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/MatlabTestsRedirect.cmake
@@ -15,6 +15,7 @@
 #   -Dcustom_Matlab_test_command=""
 #   -Dcmd_to_run_before_test=""
 #   -Dunittest_file_to_run
+#   -Dmaut_BATCH_OPTION="-batch"
 #   -P FindMatlab_TestsRedirect.cmake
 
 set(Matlab_UNIT_TESTS_CMD -nosplash -nodesktop -nodisplay ${Matlab_ADDITIONAL_STARTUP_OPTIONS})
@@ -84,7 +85,7 @@ execute_process(
   # Do not use a full path to log file.  Depend on the fact that the log file
   # is always going to go in the working_directory.  This is because matlab
   # on unix is a shell script that does not handle spaces in the logfile path.
-  COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${log_file_name}" -r "${Matlab_SCRIPT_TO_RUN}"
+  COMMAND "${Matlab_PROGRAM}" ${Matlab_UNIT_TESTS_CMD} -logfile "${log_file_name}" "${maut_BATCH_OPTION}" "${Matlab_SCRIPT_TO_RUN}"
   RESULT_VARIABLE res
   ${test_timeout}
   OUTPUT_QUIET # we do not want the output twice
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-C.cmake
new file mode 100644
index 00000000..c85e7469
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/ADSP-Common)
+__platform_adsp(C)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-CXX.cmake
new file mode 100644
index 00000000..d827c80a
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/ADSP-Common)
+__platform_adsp(CXX)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-Common.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-Common.cmake
new file mode 100644
index 00000000..2ba90b2f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-Common.cmake
@@ -0,0 +1,36 @@
+include_guard()
+
+macro(__platform_adsp_init)
+  if(NOT CMAKE_ADSP_PLATFORM_INITIALIZED)
+    if(NOT CMAKE_SYSTEM_PROCESSOR)
+      message(FATAL_ERROR "ADSP: CMAKE_SYSTEM_PROCESSOR is required but not set")
+    endif()
+
+    set(CMAKE_ADSP_PROCESSOR "ADSP-${CMAKE_SYSTEM_PROCESSOR}")
+    string(TOUPPER "${CMAKE_ADSP_PROCESSOR}" CMAKE_ADSP_PROCESSOR)
+
+    set(CMAKE_ADSP_COMPILER_NAME cc21k.exe)
+    if(CMAKE_ADSP_PROCESSOR MATCHES "^ADSP-BF")
+      set(CMAKE_ADSP_COMPILER_NAME ccblkfn.exe)
+    endif()
+
+    set(CMAKE_ADSP_PLATFORM_INITIALIZED TRUE)
+  endif()
+endmacro()
+
+macro(__platform_adsp lang)
+  __platform_adsp_init()
+  set(CMAKE_${lang}_COMPILER "${CMAKE_ADSP_ROOT}/${CMAKE_ADSP_COMPILER_NAME}")
+
+  execute_process(
+    COMMAND "${CMAKE_${lang}_COMPILER}" "-proc=${CMAKE_ADSP_PROCESSOR}" "-version"
+    OUTPUT_QUIET ERROR_QUIET
+    RESULT_VARIABLE _adsp_is_valid_proc
+  )
+  if(NOT _adsp_is_valid_proc EQUAL 0)
+    message(FATAL_ERROR
+      "ADSP: unsupported processor '${CMAKE_ADSP_PROCESSOR}' for CMAKE_${lang}_COMPILER:\n"
+      "  ${CMAKE_${lang}_COMPILER}"
+    )
+  endif()
+endmacro()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-Determine.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-Determine.cmake
new file mode 100644
index 00000000..6ccf1ea9
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP-Determine.cmake
@@ -0,0 +1,26 @@
+if(IS_DIRECTORY "$ENV{ADSP_ROOT}")
+    file(TO_CMAKE_PATH "$ENV{ADSP_ROOT}" CMAKE_ADSP_ROOT)
+endif()
+
+macro(_find_adsp_root path_pattern)
+  set(CMAKE_ADSP_ROOT "")
+  set(_adsp_root_version "0")
+  file(GLOB _adsp_root_paths "${path_pattern}")
+  foreach(_current_adsp_root_path IN LISTS _adsp_root_paths)
+    string(REGEX MATCH "([0-9\\.]+)/?$" _current_adsp_root_version "${_current_adsp_root_path}")
+    if(_current_adsp_root_version VERSION_GREATER _adsp_root_version)
+      set(CMAKE_ADSP_ROOT "${_current_adsp_root_path}")
+      set(_adsp_root_version "${_current_adsp_root_version}")
+    endif()
+  endforeach()
+endmacro()
+
+if(NOT CMAKE_ADSP_ROOT)
+  _find_adsp_root("C:/Analog Devices/CrossCore Embedded Studio *")
+endif()
+if(NOT CMAKE_ADSP_ROOT)
+  _find_adsp_root("C:/Program Files (x86)/Analog Devices/VisualDSP *")
+endif()
+if(NOT IS_DIRECTORY "${CMAKE_ADSP_ROOT}")
+  message(FATAL_ERROR "ADSP: could not find CCES/VDSP++ install directory ${CMAKE_ADSP_ROOT}")
+endif()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP.cmake
new file mode 100644
index 00000000..15e9dd2a
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/ADSP.cmake
@@ -0,0 +1,4 @@
+include(Platform/ADSP-Common)
+__platform_adsp_init()
+
+set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU.cmake
index 5a532c7c..a9aa8e02 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-GNU.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-GNU.cmake
@@ -23,11 +23,11 @@ macro(__aix_compiler_gnu lang)
   # Construct the export list ourselves to pass only the object files so
   # that we export only the symbols actually provided by the sources.
   set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
-    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <OBJECT_DIR>/exports.exp <AIX_EXPORTS> <OBJECTS>"
+    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <OBJECT_DIR>/exports.exp -c <CMAKE_${lang}_COMPILER> <AIX_EXPORTS> <OBJECTS>"
     "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> -Wl,-bE:<OBJECT_DIR>/exports.exp <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
     )
 
   set(CMAKE_${lang}_LINK_EXECUTABLE_WITH_EXPORTS
-    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <TARGET_IMPLIB> -l . <AIX_EXPORTS> <OBJECTS>"
+    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <TARGET_IMPLIB> -c <CMAKE_${lang}_COMPILER> -l . <AIX_EXPORTS> <OBJECTS>"
     "<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> -Wl,-bE:<TARGET_IMPLIB> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 endmacro()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang-C.cmake
new file mode 100644
index 00000000..db21f29f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/AIX-IBMClang)
+__aix_compiler_ibmclang(C)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang-CXX.cmake
new file mode 100644
index 00000000..bf580ec8
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang-CXX.cmake
@@ -0,0 +1,3 @@
+include(Platform/AIX-IBMClang)
+__aix_compiler_ibmclang(CXX)
+unset(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang.cmake
similarity index 54%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang.cmake
index aad17f1e..4e5205e1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-IBMClang.cmake
@@ -3,13 +3,14 @@
 
 
 # This module is shared by multiple languages; use include blocker.
-if(__LINUX_COMPILER_NVIDIA)
+if(__AIX_COMPILER_IBMCLANG)
   return()
 endif()
-set(__LINUX_COMPILER_NVIDIA 1)
+set(__AIX_COMPILER_IBMCLANG 1)
 
-include(Platform/Linux-PGI)
+include(Platform/AIX-GNU)
 
-macro(__linux_compiler_nvhpc lang)
-  __linux_compiler_pgi(${lang})
+macro(__aix_compiler_ibmclang lang)
+  __aix_compiler_gnu(${lang})
+  unset(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY)
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-VisualAge-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-VisualAge-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-VisualAge-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-VisualAge-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-VisualAge-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-VisualAge-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-VisualAge-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-VisualAge-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-VisualAge-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-VisualAge-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-VisualAge-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-VisualAge-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL.cmake
index 2a8c159a..902cbb3a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XL.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XL.cmake
@@ -29,12 +29,12 @@ macro(__aix_compiler_xl lang)
   # Construct the export list ourselves to pass only the object files so
   # that we export only the symbols actually provided by the sources.
   set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
-    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <OBJECT_DIR>/exports.exp <AIX_EXPORTS>${_OBJECTS}"
+    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <OBJECT_DIR>/exports.exp -c <CMAKE_${lang}_COMPILER> <AIX_EXPORTS>${_OBJECTS}"
     "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> -Wl,-bE:<OBJECT_DIR>/exports.exp <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
     )
 
   set(CMAKE_${lang}_LINK_EXECUTABLE_WITH_EXPORTS
-    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <TARGET_IMPLIB> -l . <AIX_EXPORTS> <OBJECTS>"
+    "\"${CMAKE_ROOT}/Modules/Platform/AIX/ExportImportList\" -o <TARGET_IMPLIB> -c <CMAKE_${lang}_COMPILER> -l . <AIX_EXPORTS> <OBJECTS>"
     "<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> -Wl,-bE:<TARGET_IMPLIB> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 
   unset(_OBJECTS)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XLClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XLClang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XLClang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XLClang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XLClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XLClang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XLClang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XLClang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XLClang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XLClang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX-XLClang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX-XLClang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/AIX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/AIX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/AIX.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/AIX/ExportImportList b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX/ExportImportList
new file mode 100755
index 00000000..5e16fcb4
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/AIX/ExportImportList
@@ -0,0 +1,82 @@
+#!/bin/sh
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# This script is internal to CMake and meant only to be
+# invoked by CMake-generated build systems on AIX.
+
+usage='usage: ExportImportList -o <out-file> -c <compiler> [-l <lib>] [-n] [--] <objects>...'
+
+die() {
+    echo "$@" 1>&2; exit 1
+}
+
+# Process command-line arguments.
+out=''
+lib=''
+no_objects=''
+compiler=''
+while test "$#" != 0; do
+    case "$1" in
+    -l) shift; lib="$1" ;;
+    -o) shift; out="$1" ;;
+    -n) no_objects='1' ;;
+    -c) shift; compiler="$1" ;;
+    --) shift; break ;;
+    -*) die "$usage" ;;
+    *)  break ;;
+    esac
+    shift
+done
+test -n "$out" || die "$usage"
+# We need the compiler executable to resolve where the ibm-llvm-nm executable is
+test -n "$compiler" || die "$usage"
+
+# Build a temporary file that atomically replaces the output later.
+out_tmp="$out.tmp$$"
+trap 'rm -f "$out_tmp"' EXIT INT TERM
+> "$out_tmp"
+
+# If IPA was enabled and a compiler from the IBMClang family is used, then
+# the object files contain LLVM bitcode[0] rather than XCOFF objects and so
+# need to be handled differently.
+#
+# [0]: https://www.ibm.com/docs/en/openxl-c-and-cpp-aix/17.1.0?topic=compatibility-link-time-optimization-lto
+NM="$(dirname "$compiler")/../libexec/ibm-llvm-nm"
+
+function IsBitcode {
+    # N4 = first 4 bytes, -tx = output in hexadecimal, -An = don't display offset
+    # cut: trim off the preceding whitespace where the offset would be
+    # 4243code is the hexadecimal magic number for LLVM bitcode
+    [ "$(od -N4 -tx -An $1 | cut -d ' ' -f 2)" == "4243c0de" ];
+}
+
+# Collect symbols exported from all object files.
+if test -z "$no_objects"; then
+    for f in "$@"; do
+        if IsBitcode "$f"; then
+            "$NM" "$f" --defined-only --extern-only --just-symbol-name 2>/dev/null
+        else
+            dump -tov -X 32_64 "$f" |
+            awk '
+                BEGIN {
+                    V["EXPORTED"]=" export"
+                    V["PROTECTED"]=" protected"
+                }
+                /^\[[0-9]+\]\tm +[^ ]+ +\.(text|data|bss) +[^ ]+ +(extern|weak) +(EXPORTED|PROTECTED| ) / {
+                    if (!match($NF,/^(\.|__sinit|__sterm|__[0-9]+__)/)) {
+                        print $NF V[$(NF-1)]
+                    }
+                }
+            '
+        fi
+    done >> "$out_tmp"
+fi
+
+# Generate the export/import file.
+{
+    if test -n "$lib"; then
+        echo "#! $lib"
+    fi
+    sort -u "$out_tmp"
+} > "$out"
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/ARTOS-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ARTOS-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/ARTOS-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/ARTOS-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/ARTOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ARTOS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/ARTOS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/ARTOS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Common.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Common.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Common.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Common.cmake
index 39da9330..f1deaca6 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Common.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Common.cmake
@@ -56,7 +56,7 @@ if(CMAKE_ANDROID_STL_TYPE)
         if(_ANDROID_STL_EXCEPTIONS OR _ANDROID_STL_RTTI)
           string(APPEND CMAKE_${lang}_STANDARD_LIBRARIES " -lc++abi")
           if(CMAKE_SYSTEM_VERSION LESS 21)
-            list(APPEND CMAKE_${lang}_STANDARD_LIBRARIES "-landroid_support")
+            string(APPEND CMAKE_${lang}_STANDARD_LIBRARIES " -landroid_support")
           endif()
         endif()
       endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Determine-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Determine-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Determine-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Determine-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Determine.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Determine.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Determine.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Determine.cmake
index 2d2cd5c7..a4e95749 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Determine.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Determine.cmake
@@ -52,14 +52,16 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio")
     endif()
     configure_file(${CMAKE_ROOT}/Modules/Platform/Android/VCXProjInspect.vcxproj.in
       ${CMAKE_PLATFORM_INFO_DIR}/VCXProjInspect.vcxproj @ONLY)
+    cmake_host_system_information(RESULT _msbuild QUERY VS_MSBUILD_COMMAND) # undocumented query
     execute_process(
-      COMMAND "${CMAKE_VS_MSBUILD_COMMAND}" "VCXProjInspect.vcxproj"
+      COMMAND "${_msbuild}" "VCXProjInspect.vcxproj"
         "/p:Configuration=Debug" "/p:Platform=${vcx_platform}"
       WORKING_DIRECTORY ${CMAKE_PLATFORM_INFO_DIR}
       OUTPUT_VARIABLE VCXPROJ_INSPECT_OUTPUT
       ERROR_VARIABLE VCXPROJ_INSPECT_OUTPUT
       RESULT_VARIABLE VCXPROJ_INSPECT_RESULT
       )
+    unset(_msbuild)
     if(NOT CMAKE_SYSROOT AND VCXPROJ_INSPECT_OUTPUT MATCHES "CMAKE_SYSROOT=([^%\r\n]+)[\r\n]")
       # Strip VS diagnostic output from the end of the line.
       string(REGEX REPLACE " \\(TaskId:[0-9]*\\)$" "" _sysroot "${CMAKE_MATCH_1}")
@@ -267,7 +269,7 @@ endif()
 if(CMAKE_ANDROID_NDK)
   # Identify the host platform.
   if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "64")
       set(CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG "darwin-x86_64")
     else()
       set(CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG "darwin-x86")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Initialize.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Initialize.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android-Initialize.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android-Initialize.cmake
index 50f06209..63bc9491 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Android-Initialize.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Android-Initialize.cmake
@@ -56,11 +56,6 @@ if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED)
     set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
   endif()
 
-  # Don't search paths in PATH environment variable.
-  if(NOT DEFINED CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH)
-    set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF)
-  endif()
-
   # Allows CMake to find headers in the architecture-specific include directories.
   set(CMAKE_LIBRARY_ARCHITECTURE "${CMAKE_ANDROID_ARCH_TRIPLE}")
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android.cmake
similarity index 79%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android.cmake
index 6944e322..d0f686cb 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Android.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Android.cmake
@@ -5,6 +5,7 @@ if(CMAKE_ANDROID_NDK)
 endif()
 
 include(Platform/Linux)
+unset(LINUX)
 
 set(ANDROID 1)
 
@@ -13,6 +14,12 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Android")
   return()
 endif()
 
+# NDK organizes API level specific libraries in numbered subdirectories. To
+# avoid incorrect inclusion of libraries below the targeted API level, disable
+# architecture specific path suffixes by default.
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF)
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
+
 # Conventionally Android does not use versioned soname
 # But in modern versions it is acceptable
 if(NOT DEFINED CMAKE_PLATFORM_NO_VERSIONED_SONAME)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/Determine-Compiler-NDK.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/Determine-Compiler-NDK.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/Determine-Compiler-NDK.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/Determine-Compiler-NDK.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/Determine-Compiler-Standalone.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/Determine-Compiler-Standalone.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/Determine-Compiler-Standalone.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/Determine-Compiler-Standalone.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/Determine-Compiler.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/Determine-Compiler.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/Determine-Compiler.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/Determine-Compiler.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/VCXProjInspect.vcxproj.in b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/VCXProjInspect.vcxproj.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/VCXProjInspect.vcxproj.in
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/VCXProjInspect.vcxproj.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-common-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-common-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-common-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-common-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-common-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-common-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-common-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-common-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-common.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-common.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-common.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-common.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips64-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips64-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips64-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips64-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips64-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips64-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-mips64-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-mips64-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86_64-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86_64-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86_64-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86_64-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86_64-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86_64-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/abi-x86_64-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/abi-x86_64-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-c++.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-c++.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-c++.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-c++.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-c++_shared.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-c++_shared.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-c++_shared.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-c++_shared.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-c++_static.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-c++_static.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-c++_static.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-c++_static.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gabi++.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gabi++.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gabi++.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gabi++.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gabi++_static.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gabi++_static.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gabi++_static.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gabi++_static.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gnustl.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gnustl.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gnustl.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gnustl.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gnustl_static.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gnustl_static.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-gnustl_static.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-gnustl_static.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-none.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-none.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-none.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-none.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-stlport.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-stlport.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-stlport.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-stlport.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-stlport_shared.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-stlport_static.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-stlport_static.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-stlport_static.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-stlport_static.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-system.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-system.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Android/ndk-stl-system.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Android/ndk-stl-system.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Absoft-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Absoft-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Absoft-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Absoft-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Apple-Swift.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Apple-Swift.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Apple-Swift.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Apple-Swift.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-OBJC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-OBJC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-OBJC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-OBJC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-OBJCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-OBJCXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-AppleClang-OBJCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-AppleClang-OBJCXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-OBJC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-OBJC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-OBJC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-OBJC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-OBJCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-OBJCXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang-OBJCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang-OBJCXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Clang.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-OBJC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-OBJC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-OBJC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-OBJC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-OBJCXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-OBJCXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU-OBJCXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU-OBJCXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-Intel.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-Intel.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-IntelLLVM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-IntelLLVM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-NAG-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-NAG-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-NAG-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-NAG-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-NVIDIA-CUDA.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-NVIDIA-CUDA.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-NVIDIA-CUDA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-NVIDIA-CUDA.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-PGI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-PGI.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-VisualAge-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-VisualAge-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-VisualAge-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-VisualAge-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-VisualAge-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-VisualAge-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-VisualAge-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-VisualAge-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Apple-XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Apple-XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Apple-XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Apple-XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BSDOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BSDOS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BSDOS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BSDOS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BeOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BeOS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BeOS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BeOS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneL.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneL.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneL.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneL.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-base.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-base.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-base.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-base.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-dynamic.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-dynamic.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneP-static.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneP-static.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-base.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-base.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-base.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-base.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-dynamic.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-dynamic.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/BlueGeneQ-static.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/BlueGeneQ-static.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU.cmake
similarity index 68%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU.cmake
index b81bd4d2..ef640126 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-GNU.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-GNU.cmake
@@ -14,6 +14,34 @@ string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,--enable-auto-import")
 set(CMAKE_GNULD_IMAGE_VERSION
   "-Wl,--major-image-version,<TARGET_VERSION_MAJOR>,--minor-image-version,<TARGET_VERSION_MINOR>")
 set(CMAKE_GENERATOR_RC windres)
+
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
 macro(__cygwin_compiler_gnu lang)
   # Binary link rules.
   set(CMAKE_${lang}_CREATE_SHARED_MODULE
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-windres.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-windres.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN-windres.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN-windres.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CYGWIN.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CYGWIN.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Catamount.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Catamount.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Catamount.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Catamount.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/CrayLinuxEnvironment.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/CrayLinuxEnvironment.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/CrayLinuxEnvironment.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/CrayLinuxEnvironment.cmake
index f2aaf3f7..b982b3f3 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/CrayLinuxEnvironment.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/CrayLinuxEnvironment.cmake
@@ -68,6 +68,7 @@ if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
     )
   endif()
 endif()
+_cmake_record_install_prefix()
 
 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
   $ENV{SYSROOT_DIR}/usr/include/X11
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/DOS-OpenWatcom-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/DOS-OpenWatcom-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/DOS-OpenWatcom-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/DOS-OpenWatcom-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/DOS-OpenWatcom-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/DOS-OpenWatcom-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/DOS-OpenWatcom-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/DOS-OpenWatcom-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/DOS-OpenWatcom.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/DOS-OpenWatcom.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/DOS-OpenWatcom.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/DOS-OpenWatcom.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/DOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/DOS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/DOS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/DOS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Darwin-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Darwin-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Darwin-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Darwin-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Darwin-Initialize.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Darwin-Initialize.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Darwin-Initialize.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Darwin-Initialize.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Darwin.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Darwin.cmake
similarity index 85%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Darwin.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Darwin.cmake
index d9a78947..ac2478bc 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Darwin.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Darwin.cmake
@@ -47,7 +47,9 @@ set(CMAKE_SHARED_MODULE_PREFIX "lib")
 set(CMAKE_SHARED_MODULE_SUFFIX ".so")
 set(CMAKE_MODULE_EXISTS 1)
 set(CMAKE_DL_LIBS "")
-set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
+if(NOT "${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5")
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
+endif()
 
 foreach(lang C CXX OBJC OBJCXX)
   set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
@@ -106,6 +108,33 @@ foreach(lang C CXX Fortran OBJC OBJCXX)
   set(CMAKE_${lang}_FRAMEWORK_SEARCH_FLAG -F)
 endforeach()
 
+# Defines LINK_LIBRARY features for frameworks
+set(CMAKE_LINK_LIBRARY_USING_FRAMEWORK "LINKER:-framework,<LIBRARY>")
+set(CMAKE_LINK_LIBRARY_USING_FRAMEWORK_SUPPORTED TRUE)
+
+set(CMAKE_LINK_LIBRARY_USING_NEEDED_FRAMEWORK "LINKER:-needed_framework,<LIBRARY>")
+set(CMAKE_LINK_LIBRARY_USING_NEEDED_FRAMEWORK_SUPPORTED TRUE)
+
+set(CMAKE_LINK_LIBRARY_USING_REEXPORT_FRAMEWORK "LINKER:-reexport_framework,<LIBRARY>")
+set(CMAKE_LINK_LIBRARY_USING_REEXPORT_FRAMEWORK_SUPPORTED TRUE)
+
+set(CMAKE_LINK_LIBRARY_USING_WEAK_FRAMEWORK "LINKER:-weak_framework,<LIBRARY>")
+set(CMAKE_LINK_LIBRARY_USING_WEAK_FRAMEWORK_SUPPORTED TRUE)
+
+# Defines LINK_LIBRARY features for libraries
+set(CMAKE_LINK_LIBRARY_USING_NEEDED_LIBRARY "PATH{LINKER:-needed_library <LIBRARY>}NAME{LINKER:-needed-l<LIBRARY>}")
+set(CMAKE_LINK_LIBRARY_USING_NEEDED_LIBRARY_SUPPORTED TRUE)
+
+set(CMAKE_LINK_LIBRARY_USING_REEXPORT_LIBRARY "PATH{LINKER:-reexport_library <LIBRARY>}NAME{LINKER:-reexport-l<LIBRARY>}")
+set(CMAKE_LINK_LIBRARY_USING_REEXPORT_LIBRARY_SUPPORTED TRUE)
+
+set(CMAKE_LINK_LIBRARY_USING_WEAK_LIBRARY "PATH{LINKER:-weak_library <LIBRARY>}NAME{LINKER:-weak-l<LIBRARY>}")
+set(CMAKE_LINK_LIBRARY_USING_WEAK_LIBRARY_SUPPORTED TRUE)
+
+# Defines LINK_LIBRARY feature to Force loading of all members of an archive
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:-force_load <LIB_ITEM>")
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
 # default to searching for frameworks first
 if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
   set(CMAKE_FIND_FRAMEWORK FIRST)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/DragonFly.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/DragonFly.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/DragonFly.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/DragonFly.cmake
index 12e5f3cc..994ba793 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/DragonFly.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/DragonFly.cmake
@@ -3,6 +3,7 @@
 # see http://archive.netbsd.se/?ml=dfbsd-users&a=2007-07&m=4678361
 
 include(Platform/FreeBSD)
+set(BSD "DragonFlyBSD")
 
 # DragonFly BSD requires -z origin to enable $ORIGIN expansion in RPATH.
 # This is not required for FreeBSD since 10.2-RELEASE.
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Euros.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Euros.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Euros.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Euros.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/FreeBSD-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/FreeBSD-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/FreeBSD-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/FreeBSD-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/FreeBSD.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/FreeBSD.cmake
new file mode 100644
index 00000000..9cd93998
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/FreeBSD.cmake
@@ -0,0 +1,64 @@
+set(BSD "FreeBSD")
+set(CMAKE_DL_LIBS "")
+set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
+set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
+# PIE link options are managed in Compiler/<compiler>.cmake file
+set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
+# Does not require -z origin since 10.2-RELEASE
+set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
+
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+
+# Initialize C link type selection flags.  These flags are used when
+# building a shared library, shared module, or executable that links
+# to other libraries to select whether to use the static or shared
+# versions of the libraries.
+foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
+  set(CMAKE_${type}_LINK_STATIC_C_FLAGS "-Wl,-Bstatic")
+  set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
+endforeach()
+
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
+# Features for LINK_GROUP generator expression
+## RESCAN: request the linker to rescan static libraries until there is
+## no pending undefined symbols
+set(CMAKE_LINK_GROUP_USING_RESCAN "LINKER:--start-group" "LINKER:--end-group")
+set(CMAKE_LINK_GROUP_USING_RESCAN_SUPPORTED TRUE)
+
+
+include(Platform/UnixPaths)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Fuchsia.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Fuchsia.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Fuchsia.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Fuchsia.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/GHS-MULTI-Determine.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/GHS-MULTI-Determine.cmake
new file mode 100644
index 00000000..67464f77
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/GHS-MULTI-Determine.cmake
@@ -0,0 +1,129 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# Setup variables used for Green Hills MULTI generator
+# -- Allow users to override these values.
+
+if(CMAKE_GENERATOR MATCHES "Green Hills MULTI")
+
+  # Set the project primaryTarget value
+  # If not set then primaryTarget will be determined by the generator
+  if((NOT DEFINED GHS_PRIMARY_TARGET) OR (DEFINED CACHE{GHS_PRIMARY_TARGET}))
+    set(GHS_PRIMARY_TARGET "IGNORE" CACHE STRING "GHS MULTI primaryTarget")
+    mark_as_advanced(GHS_PRIMARY_TARGET)
+  endif()
+
+  # Setup MULTI toolset selection variables
+  if((NOT DEFINED GHS_TOOLSET_ROOT) OR (DEFINED CACHE{GHS_TOOLSET_ROOT}))
+    if(CMAKE_HOST_UNIX)
+      set(_ts_root "/usr/ghs")
+    else()
+      set(_ts_root "C:/ghs")
+    endif()
+    set(GHS_TOOLSET_ROOT "${_ts_root}" CACHE PATH "GHS platform toolset root directory")
+    mark_as_advanced(GHS_TOOLSET_ROOT)
+    unset(_ts_root)
+  endif()
+
+  # Setup MULTI project variables
+  if((NOT DEFINED GHS_CUSTOMIZATION) OR (DEFINED CACHE{GHS_CUSTOMIZATION}))
+    set(GHS_CUSTOMIZATION "" CACHE FILEPATH "optional GHS customization")
+    mark_as_advanced(GHS_CUSTOMIZATION)
+  endif()
+
+  if((NOT DEFINED GHS_GPJ_MACROS) OR (DEFINED CACHE{GHS_GPJ_MACROS}))
+    set(GHS_GPJ_MACROS "" CACHE STRING "optional GHS macros generated in the .gpjs for legacy reasons")
+    mark_as_advanced(GHS_GPJ_MACROS)
+  endif()
+
+endif()
+
+# If project primaryTarget not set then set target platform name.
+# -- May be used by the generator when determining the primaryTarget.
+if(NOT GHS_PRIMARY_TARGET)
+  if((NOT DEFINED GHS_TARGET_PLATFORM) OR (DEFINED CACHE{GHS_TARGET_PLATFORM}))
+    set(GHS_TARGET_PLATFORM "integrity" CACHE STRING "GHS MULTI target platform")
+    mark_as_advanced(GHS_TARGET_PLATFORM)
+  endif()
+endif()
+
+# Settings for OS selection
+if((NOT DEFINED GHS_OS_ROOT) OR (DEFINED CACHE{GHS_OS_ROOT}))
+  if(CMAKE_HOST_UNIX)
+    set(_os_root "/usr/ghs")
+  else()
+    set(_os_root "C:/ghs")
+  endif()
+  set(GHS_OS_ROOT "${_os_root}" CACHE PATH "GHS platform OS search root directory")
+  unset(_os_root)
+  mark_as_advanced(GHS_OS_ROOT)
+endif()
+
+# Search for GHS_OS_DIR if not set by user and is known to be required
+if(GHS_PRIMARY_TARGET MATCHES "integrity" OR GHS_TARGET_PLATFORM MATCHES "integrity")
+  # Needed - Use a value that will make it apparent RTOS selection failed
+  set(_ghs_os_dir "GHS_OS_DIR-NOT-SPECIFIED")
+else()
+  # Not needed for this target
+  set(_ghs_os_dir "IGNORE")
+endif()
+
+if(_ghs_os_dir AND NOT DEFINED GHS_OS_DIR)
+  if(EXISTS ${GHS_OS_ROOT})
+
+    # Get all directories in root directory
+    FILE(GLOB GHS_CANDIDATE_OS_DIRS
+      LIST_DIRECTORIES true RELATIVE ${GHS_OS_ROOT} ${GHS_OS_ROOT}/*)
+    FILE(GLOB GHS_CANDIDATE_OS_FILES
+      LIST_DIRECTORIES false RELATIVE ${GHS_OS_ROOT} ${GHS_OS_ROOT}/*)
+    if(GHS_CANDIDATE_OS_FILES)
+      list(REMOVE_ITEM GHS_CANDIDATE_OS_DIRS ${GHS_CANDIDATE_OS_FILES})
+    endif ()
+
+    # Filter based on platform name
+    if(GHS_PRIMARY_TARGET MATCHES "integrity" OR GHS_TARGET_PLATFORM MATCHES "integrity")
+      list(FILTER GHS_CANDIDATE_OS_DIRS INCLUDE REGEX "int[0-9][0-9][0-9][0-9a-z]")
+    endif()
+
+    # Select latest? of matching candidates
+    if(GHS_CANDIDATE_OS_DIRS)
+      list(SORT GHS_CANDIDATE_OS_DIRS)
+      list(GET GHS_CANDIDATE_OS_DIRS -1 _ghs_os_dir)
+      string(CONCAT _ghs_os_dir ${GHS_OS_ROOT} "/" ${_ghs_os_dir})
+    endif()
+  endif()
+endif()
+
+#Used for targets requiring RTOS
+if((NOT DEFINED GHS_OS_DIR) OR (DEFINED CACHE{GHS_OS_DIR}))
+  set(GHS_OS_DIR "${_ghs_os_dir}" CACHE PATH "GHS platform OS directory")
+  mark_as_advanced(GHS_OS_DIR)
+endif()
+unset(_ghs_os_dir)
+
+if((NOT DEFINED GHS_OS_DIR_OPTION) OR (DEFINED CACHE{GHS_OS_DIR_OPTION}))
+  set(GHS_OS_DIR_OPTION "-os_dir " CACHE STRING "GHS compiler OS option")
+  mark_as_advanced(GHS_OS_DIR_OPTION)
+endif()
+
+# Select GHS_BSP_NAME if not set by user and is known to be required
+if(GHS_PRIMARY_TARGET MATCHES "integrity" OR GHS_TARGET_PLATFORM MATCHES "integrity")
+  set(_ghs_bsp_name "GHS_BSP_NAME-NOT-SPECIFIED")
+else()
+  set(_ghs_bsp_name "IGNORE")
+endif()
+
+if(_ghs_bsp_name AND NOT DEFINED GHS_BSP_NAME)
+  # First try taking architecture from `-A` option
+  if(CMAKE_GENERATOR_PLATFORM)
+    set(_ghs_bsp_name "sim${CMAKE_GENERATOR_PLATFORM}")
+  else()
+    set(_ghs_bsp_name "simarm")
+  endif()
+endif()
+
+if((NOT DEFINED GHS_BSP_NAME) OR (DEFINED CACHE{GHS_BSP_NAME}))
+  set(GHS_BSP_NAME "${_ghs_bsp_name}" CACHE STRING "BSP name")
+  mark_as_advanced(GHS_BSP_NAME)
+endif()
+unset(_ghs_bsp_name)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/GHS-MULTI.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/GHS-MULTI.cmake
similarity index 91%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/GHS-MULTI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/GHS-MULTI.cmake
index 60a15c49..5b28f292 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/GHS-MULTI.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/GHS-MULTI.cmake
@@ -13,5 +13,3 @@ set(GHSMULTI 1)
 
 set(CMAKE_FIND_LIBRARY_PREFIXES "")
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-
-include(Platform/WindowsPaths)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/GNUtoMS_lib.bat.in b/deps/cmake/share/cmake-3.25/Modules/Platform/GNUtoMS_lib.bat.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/GNUtoMS_lib.bat.in
rename to deps/cmake/share/cmake-3.25/Modules/Platform/GNUtoMS_lib.bat.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/GNUtoMS_lib.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/GNUtoMS_lib.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/GNUtoMS_lib.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/GNUtoMS_lib.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-Common.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-Common.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Generic-ADSP-Common.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ADSP-Common.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ELF.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ELF.cmake
new file mode 100644
index 00000000..943cb6b0
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-ELF.cmake
@@ -0,0 +1,7 @@
+# This is a platform definition file for platforms without
+# an operating system using the ELF executable format.
+# It is used when CMAKE_SYSTEM_NAME is set to "Generic-ELF"
+
+include(Platform/Generic)
+
+set(CMAKE_EXECUTABLE_SUFFIX .elf)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Generic-SDCC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic-SDCC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Generic-SDCC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Generic-SDCC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Generic.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Generic.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Generic.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Generic.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX-HP.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX-HP.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/HP-UX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/HP-UX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Haiku.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Haiku.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Haiku.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Haiku.cmake
index 7e0af616..b8e3ba62 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Haiku.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Haiku.cmake
@@ -1,8 +1,3 @@
-# process only once
-if(HAIKU)
-  return()
-endif()
-
 set(HAIKU 1)
 set(UNIX 1)
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Absoft-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Absoft-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Absoft-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Absoft-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-CCur-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-CCur-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-CCur-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-CCur-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Fujitsu-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Fujitsu-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Fujitsu-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Fujitsu-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Fujitsu-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Fujitsu-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Fujitsu-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Fujitsu-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Fujitsu.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Fujitsu.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Fujitsu.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Fujitsu.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-Intel.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-Intel.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM.cmake
similarity index 58%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM.cmake
index 1363b442..992f80e0 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-IntelLLVM.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-IntelLLVM.cmake
@@ -8,18 +8,6 @@ if(__LINUX_COMPILER_INTEL_LLVM)
 endif()
 set(__LINUX_COMPILER_INTEL_LLVM 1)
 
-if(NOT XIAR)
-  set(_intel_xiar_hints)
-  foreach(lang C CXX Fortran)
-    if(IS_ABSOLUTE "${CMAKE_${lang}_COMPILER}")
-      get_filename_component(_hint "${CMAKE_${lang}_COMPILER}" PATH)
-      list(APPEND _intel_xiar_hints ${_hint})
-    endif()
-  endforeach()
-  find_program(XIAR NAMES xiar HINTS ${_intel_xiar_hints})
-  mark_as_advanced(XIAR)
-endif()
-
 macro(__linux_compiler_intel_llvm lang)
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
@@ -37,19 +25,5 @@ macro(__linux_compiler_intel_llvm lang)
   set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-Wl,")
   set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP ",")
 
-  set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES)
-
-  if(XIAR)
-    # INTERPROCEDURAL_OPTIMIZATION
-    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO -ipo)
-    set(CMAKE_${lang}_CREATE_STATIC_LIBRARY_IPO
-      "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
-      "${XIAR} -s <TARGET> ")
-    set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
-    set(_CMAKE_${lang}_IPO_LEGACY_BEHAVIOR YES)
-  else()
-    set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER NO)
-  endif()
-
   set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
 endmacro()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-C.cmake
new file mode 100644
index 00000000..b204c550
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/Linux-LCC)
+__linux_compiler_lcc(C)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-CXX.cmake
new file mode 100644
index 00000000..cf2fa354
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/Linux-LCC)
+__linux_compiler_lcc(CXX)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-Fortran.cmake
new file mode 100644
index 00000000..bf2a1c2d
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC-Fortran.cmake
@@ -0,0 +1,7 @@
+include(Platform/Linux-LCC)
+__linux_compiler_lcc(Fortran)
+if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS "1.26.03")
+  set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-llfortran")
+else()
+  set(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-lgfortran")
+endif()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC.cmake
new file mode 100644
index 00000000..a3754615
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-LCC.cmake
@@ -0,0 +1,15 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# This module is shared by multiple languages; use include blocker.
+if(__LINUX_COMPILER_LCC)
+  return()
+endif()
+set(__LINUX_COMPILER_LCC 1)
+
+macro(__linux_compiler_lcc lang)
+  # We pass this for historical reasons.  Projects may have
+  # executables that use dlopen but do not set ENABLE_EXPORTS.
+  set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-rdynamic")
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NAG-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NAG-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NAG-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NAG-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-NVHPC-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC.cmake
new file mode 100644
index 00000000..602b4178
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-NVHPC.cmake
@@ -0,0 +1,17 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# This module is shared by multiple languages; use include blocker.
+include_guard()
+
+macro(__linux_compiler_nvhpc lang)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "-fPIC")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
+  set(_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER YES)
+  set(CMAKE_${lang}_LINK_OPTIONS_PIE "-fPIE")
+  set(CMAKE_${lang}_LINK_OPTIONS_NO_PIE "")
+  set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
+  set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "")
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom-C.cmake
similarity index 60%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom-C.cmake
index 383349a2..7236c743 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom-C.cmake
@@ -1 +1,2 @@
 include(Platform/Linux-OpenWatcom)
+__linux_open_watcom(C)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom-CXX.cmake
similarity index 58%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom-CXX.cmake
index 383349a2..a5f386b8 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom-CXX.cmake
@@ -1 +1,2 @@
 include(Platform/Linux-OpenWatcom)
+__linux_open_watcom(CXX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom.cmake
similarity index 66%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom.cmake
index 5b4e9953..678d373a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-OpenWatcom.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-OpenWatcom.cmake
@@ -10,6 +10,14 @@ string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " system linux opt noextension")
 string(APPEND CMAKE_MODULE_LINKER_FLAGS_INIT " system linux")
 string(APPEND CMAKE_SHARED_LINKER_FLAGS_INIT " system linux")
 
+cmake_policy(GET CMP0136 __LINUX_WATCOM_CMP0136)
+if(__LINUX_WATCOM_CMP0136 STREQUAL "NEW")
+  set(CMAKE_WATCOM_RUNTIME_LIBRARY_DEFAULT "SingleThreaded")
+else()
+  set(CMAKE_WATCOM_RUNTIME_LIBRARY_DEFAULT "")
+endif()
+unset(__LINUX_WATCOM_CMP0136)
+
 # single/multi-threaded                 /-bm
 # default is setup for single-threaded libraries
 string(APPEND CMAKE_C_FLAGS_INIT " -bt=linux")
@@ -23,3 +31,8 @@ if(CMAKE_CROSSCOMPILING)
     set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/lh)
   endif()
 endif()
+
+macro(__linux_open_watcom lang)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreaded         "")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreaded          -bm)
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PGI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PGI.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-PathScale.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-PathScale.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-SunPro-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-SunPro-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-SunPro-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-SunPro-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-TinyCC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-TinyCC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-TinyCC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-TinyCC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-VisualAge-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-VisualAge-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-VisualAge-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-VisualAge-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-VisualAge-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-VisualAge-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-VisualAge-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-VisualAge-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-VisualAge-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-VisualAge-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-VisualAge-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-VisualAge-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-XL-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-XL-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-XL-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-XL-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-XL-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-XL-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-XL-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-XL-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-XL-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-XL-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-XL-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-XL-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux-como.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux-como.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux-como.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux-como.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux.cmake
similarity index 58%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Linux.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Linux.cmake
index b5d5464e..3dc3ca35 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Linux.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Linux.cmake
@@ -1,3 +1,4 @@
+set(LINUX 1)
 set(CMAKE_DL_LIBS "dl")
 set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
 set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
@@ -19,6 +20,39 @@ foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
   set(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-Wl,-Bdynamic")
 endforeach()
 
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+# Features for LINK_GROUP generator expression
+## RESCAN: request the linker to rescan static libraries until there is
+## no pending undefined symbols
+set(CMAKE_LINK_GROUP_USING_RESCAN "LINKER:--start-group" "LINKER:--end-group")
+set(CMAKE_LINK_GROUP_USING_RESCAN_SUPPORTED TRUE)
+
+
 # Debian policy requires that shared libraries be installed without
 # executable permission.  Fedora policy requires that shared libraries
 # be installed with the executable permission.  Since the native tools
@@ -53,7 +87,12 @@ include(Platform/UnixPaths)
 
 # Debian has lib32 and lib64 paths only for compatibility so they should not be
 # searched.
-if(NOT CMAKE_CROSSCOMPILING AND EXISTS "/etc/debian_version")
-  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
-  set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+if(NOT CMAKE_CROSSCOMPILING)
+  if (EXISTS "/etc/debian_version")
+    set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
+    set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+  endif()
+  if (EXISTS "/etc/arch-release")
+    set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
+  endif()
 endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MP-RAS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MP-RAS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MP-RAS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MP-RAS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-windres.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-windres.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS-windres.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS-windres.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MSYS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MSYS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MSYS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MSYS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Midipix.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Midipix.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Midipix.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Midipix.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/MirBSD.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/MirBSD.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/MirBSD.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/MirBSD.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/NetBSD.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/NetBSD.cmake
new file mode 100644
index 00000000..52c65942
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/NetBSD.cmake
@@ -0,0 +1,50 @@
+set(BSD "NetBSD")
+set(CMAKE_DL_LIBS "")
+set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC")
+set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
+# PIE link options are managed in Compiler/<compiler>.cmake file
+set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")            # -pic
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")       # -shared
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")         # +s, flag for exe link to use shared lib
+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")       # -rpath
+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")   # : or empty
+set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
+set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
+
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
+# Features for LINK_GROUP generator expression
+## RESCAN: request the linker to rescan static libraries until there is
+## no pending undefined symbols
+set(CMAKE_LINK_GROUP_USING_RESCAN "LINKER:--start-group" "LINKER:--end-group")
+set(CMAKE_LINK_GROUP_USING_RESCAN_SUPPORTED TRUE)
+
+
+include(Platform/UnixPaths)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom-C.cmake
similarity index 61%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom-C.cmake
index 21a4d9e0..a6a6b782 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom-C.cmake
@@ -1 +1,2 @@
 include(Platform/OS2-OpenWatcom)
+__os2_open_watcom(C)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom-CXX.cmake
similarity index 58%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom-CXX.cmake
index 21a4d9e0..846bb291 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom-CXX.cmake
@@ -1 +1,2 @@
 include(Platform/OS2-OpenWatcom)
+__os2_open_watcom(CXX)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom.cmake
similarity index 70%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom.cmake
index 998fb9fd..720b9530 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/OS2-OpenWatcom.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/OS2-OpenWatcom.cmake
@@ -16,6 +16,14 @@ endif()
 set(CMAKE_C_COMPILE_OPTIONS_DLL "-bd") # Note: This variable is a ';' separated list
 set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated string.
 
+cmake_policy(GET CMP0136 __OS2_WATCOM_CMP0136)
+if(__OS2_WATCOM_CMP0136 STREQUAL "NEW")
+  set(CMAKE_WATCOM_RUNTIME_LIBRARY_DEFAULT "SingleThreaded")
+else()
+  set(CMAKE_WATCOM_RUNTIME_LIBRARY_DEFAULT "")
+endif()
+unset(__OS2_WATCOM_CMP0136)
+
 string(APPEND CMAKE_C_FLAGS_INIT " -bt=os2")
 string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=os2 -xs")
 
@@ -33,3 +41,10 @@ if(NOT CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES)
     set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES $ENV{WATCOM}/h $ENV{WATCOM}/h/os2)
   endif()
 endif()
+
+macro(__os2_open_watcom lang)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreaded         "")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreadedDLL      -br)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreaded          -bm)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreadedDLL       -bm -br)
+endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/OS2.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/OS2.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/OS2.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/OS2.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/OSF1.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/OSF1.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/OSF1.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/OSF1.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/OpenBSD.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/OpenBSD.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/OpenBSD.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/OpenBSD.cmake
index 97e2a6a8..51ea60df 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/OpenBSD.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/OpenBSD.cmake
@@ -1,4 +1,5 @@
 include(Platform/NetBSD)
+set(BSD "OpenBSD")
 
 # On OpenBSD, the compile time linker does not share it's configuration with
 # the runtime linker.  This will extract the library search paths from the
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/OpenVMS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/OpenVMS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/OpenVMS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/OpenVMS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/QNX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/QNX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/QNX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/QNX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/RISCos.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/RISCos.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/RISCos.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/RISCos.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SCO_SV.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SCO_SV.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SCO_SV.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SCO_SV.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SINIX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SINIX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SINIX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SINIX.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-ASM.cmake
new file mode 100644
index 00000000..ba1e18cf
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/SerenityOS-GNU)
+__serenity_compiler_gnu(ASM)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-C.cmake
new file mode 100644
index 00000000..791a1978
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/SerenityOS-GNU)
+__serenity_compiler_gnu(C)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-CXX.cmake
new file mode 100644
index 00000000..084e319f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-Clang-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/SerenityOS-GNU)
+__serenity_compiler_gnu(CXX)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-ASM.cmake
new file mode 100644
index 00000000..ba1e18cf
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-ASM.cmake
@@ -0,0 +1,2 @@
+include(Platform/SerenityOS-GNU)
+__serenity_compiler_gnu(ASM)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-C.cmake
new file mode 100644
index 00000000..791a1978
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/SerenityOS-GNU)
+__serenity_compiler_gnu(C)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-CXX.cmake
new file mode 100644
index 00000000..084e319f
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/SerenityOS-GNU)
+__serenity_compiler_gnu(CXX)
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU.cmake
new file mode 100644
index 00000000..ed39477a
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS-GNU.cmake
@@ -0,0 +1,24 @@
+# This module is shared by multiple languages; use include blocker.
+include_guard()
+
+set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--hash-style=gnu,-z,relro,-z,now,-z,noexecstack,-z,separate-code,-z,max-page-size=0x1000")
+
+macro(__serenity_compiler_gnu lang)
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-rpath,")
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
+  set(CMAKE_SHARED_LIBRARY_RPATH_LINK_${lang}_FLAG "-Wl,-rpath-link,")
+  set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG "-Wl,-soname,")
+  set(CMAKE_EXE_EXPORTS_${lang}_FLAG "-Wl,--export-dynamic")
+
+  set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared -Wl,--hash-style=gnu,-z,relro,-z,now,-z,noexecstack,-z,separate-code")
+
+  # Initialize link type selection flags.  These flags are used when
+  # building a shared library, shared module, or executable that links
+  # to other libraries to select whether to use the static or shared
+  # versions of the libraries.
+  foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
+    set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-Bstatic")
+    set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
+  endforeach()
+
+endmacro()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS.cmake
new file mode 100644
index 00000000..dc4f369d
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SerenityOS.cmake
@@ -0,0 +1,12 @@
+
+set(SERENITYOS 1)
+
+set(CMAKE_DL_LIBS "")
+set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
+set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
+
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
+
+include(Platform/UnixPaths)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-GNU.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/SunOS-PathScale.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/SunOS-PathScale.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS.cmake
new file mode 100644
index 00000000..b8a302cb
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/SunOS.cmake
@@ -0,0 +1,47 @@
+if(CMAKE_SYSTEM MATCHES "SunOS-4")
+  set(CMAKE_C_COMPILE_OPTIONS_PIC "-PIC")
+  set(CMAKE_C_COMPILE_OPTIONS_PIE "-PIE")
+  set(CMAKE_SHARED_LIBRARY_C_FLAGS "-PIC")
+  set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,-r")
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-R")
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+endif()
+
+
+# Features for LINK_LIBRARY generator expression
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if (CMAKE_SYSTEM_VERSION VERSION_GREATER "5.10")
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:-z,allextract"
+                                             "<LINK_ITEM>"
+                                             "LINKER:-z,defaultextract")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+
+# Features for LINK_GROUP generator expression
+if (CMAKE_SYSTEM_VERSION VERSION_GREATER "5.9")
+  ## RESCAN: request the linker to rescan static libraries until there is
+  ## no pending undefined symbols
+  set(CMAKE_LINK_GROUP_USING_RESCAN "LINKER:-z,rescan-start" "LINKER:-z,rescan-end")
+  set(CMAKE_LINK_GROUP_USING_RESCAN_SUPPORTED TRUE)
+endif()
+
+
+include(Platform/UnixPaths)
+
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+  /opt/csw
+  /opt/openwin
+  )
+
+# The Sun linker needs to find transitive shared library dependencies
+# in the -L path.
+set(CMAKE_LINK_DEPENDENT_LIBRARY_DIRS 1)
+
+# Shared libraries with no builtin soname may not be linked safely by
+# specifying the file path.
+set(CMAKE_PLATFORM_USES_PATH_WHEN_NO_SONAME 1)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Tru64.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Tru64.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Tru64.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Tru64.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/ULTRIX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/ULTRIX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/ULTRIX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/ULTRIX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/UNIX_SV.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/UNIX_SV.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/UNIX_SV.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/UNIX_SV.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/UnixPaths.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/UnixPaths.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/UnixPaths.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/UnixPaths.cmake
index b9381c3d..8a0ad239 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/UnixPaths.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/UnixPaths.cmake
@@ -44,6 +44,7 @@ if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
     )
   endif()
 endif()
+_cmake_record_install_prefix()
 
 # Non "standard" but common install prefixes
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/UnixWare.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/UnixWare.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/UnixWare.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/UnixWare.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Apple-Swift.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Apple-Swift.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Apple-Swift.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Apple-Swift.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Borland-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Borland-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Borland-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Borland-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Borland-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Borland-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Borland-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Borland-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-ASM.cmake
new file mode 100644
index 00000000..c22e3b0b
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-ASM.cmake
@@ -0,0 +1,7 @@
+include(Platform/Windows-Clang)
+__windows_compiler_clang(ASM)
+
+set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         "")
+set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL      "")
+set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug    "")
+set(CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL "")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-HIP.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-HIP.cmake
new file mode 100644
index 00000000..20879fab
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang-HIP.cmake
@@ -0,0 +1,19 @@
+include(Platform/Windows-Clang)
+set(_COMPILE_HIP_MSVC " -TP")
+__windows_compiler_clang(HIP)
+
+if("x${CMAKE_HIP_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
+  if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+      AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+      AND CMAKE_DEPFILE_FLAGS_HIP)
+    set(CMAKE_HIP_DEPENDS_USE_COMPILER TRUE)
+  endif()
+elseif("x${CMAKE_HIP_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
+  if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
+      AND CMAKE_GENERATOR MATCHES "Makefiles|WMake"
+      AND CMAKE_DEPFILE_FLAGS_HIP)
+    # dependencies are computed by the compiler itself
+    set(CMAKE_HIP_DEPFILE_FORMAT gcc)
+    set(CMAKE_HIP_DEPENDS_USE_COMPILER TRUE)
+  endif()
+endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang.cmake
similarity index 66%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang.cmake
index 373be760..33d271de 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Clang.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Clang.cmake
@@ -38,6 +38,9 @@ macro(__windows_compiler_clang_gnu lang)
   set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "-Xlinker" " ")
   set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP)
 
+  set(CMAKE_${lang}_LINKER_MANIFEST_FLAG " -Xlinker /MANIFESTINPUT:")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror")
+
   if("${CMAKE_${lang}_SIMULATE_VERSION}" MATCHES "^([0-9]+)\\.([0-9]+)")
     math(EXPR MSVC_VERSION "${CMAKE_MATCH_1}*100 + ${CMAKE_MATCH_2}")
   endif()
@@ -54,7 +57,12 @@ macro(__windows_compiler_clang_gnu lang)
   set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_LIBRARIES 1)
   set(CMAKE_${lang}_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 
-  set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto")
+  if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 3.9)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto=thin")
+  else()
+    set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-flto")
+  endif()
+
   set(_CMAKE_${lang}_IPO_SUPPORTED_BY_CMAKE YES)
   set(_CMAKE_${lang}_IPO_MAY_BE_SUPPORTED_BY_COMPILER YES)
   set(CMAKE_${lang}_ARCHIVE_CREATE_IPO "<CMAKE_AR> qc <TARGET> <LINK_FLAGS> <OBJECTS>")
@@ -66,10 +74,10 @@ macro(__windows_compiler_clang_gnu lang)
   set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
   set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
   set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
-    "<CMAKE_${lang}_COMPILER> -fuse-ld=lld-link -nostartfiles -nostdlib <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} -Xlinker /implib:<TARGET_IMPLIB> -Xlinker /pdb:<TARGET_PDB> -Xlinker /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <OBJECTS> <LINK_LIBRARIES>")
+    "<CMAKE_${lang}_COMPILER> -fuse-ld=lld-link -nostartfiles -nostdlib <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} -Xlinker /MANIFEST:EMBED -Xlinker /implib:<TARGET_IMPLIB> -Xlinker /pdb:<TARGET_PDB> -Xlinker /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> <OBJECTS> <LINK_LIBRARIES> <MANIFESTS>")
   set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
   set(CMAKE_${lang}_LINK_EXECUTABLE
-    "<CMAKE_${lang}_COMPILER> -fuse-ld=lld-link -nostartfiles -nostdlib <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Xlinker /implib:<TARGET_IMPLIB> -Xlinker /pdb:<TARGET_PDB> -Xlinker /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
+    "<CMAKE_${lang}_COMPILER> -fuse-ld=lld-link -nostartfiles -nostdlib <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Xlinker /MANIFEST:EMBED -Xlinker /implib:<TARGET_IMPLIB> -Xlinker /pdb:<TARGET_PDB> -Xlinker /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES> <MANIFESTS>")
 
   set(CMAKE_${lang}_CREATE_WIN32_EXE "-Xlinker /subsystem:windows")
   set(CMAKE_${lang}_CREATE_CONSOLE_EXE "-Xlinker /subsystem:console")
@@ -81,30 +89,49 @@ macro(__windows_compiler_clang_gnu lang)
     set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL -D_DEBUG -D_DLL -D_MT -Xclang --dependent-lib=msvcrtd)
 
     if(CMAKE_MSVC_RUNTIME_LIBRARY_DEFAULT)
-      set(__ADDED_FLAGS "")
-      set(__ADDED_FLAGS_DEBUG "")
+      set(_RTL_FLAGS "")
+      set(_RTL_FLAGS_DEBUG "")
     else()
-      set(__ADDED_FLAGS_DEBUG "-D_DEBUG -D_DLL -D_MT -Xclang --dependent-lib=msvcrtd")
-      set(__ADDED_FLAGS "-D_DLL -D_MT -Xclang --dependent-lib=msvcrt")
+      set(_RTL_FLAGS_DEBUG " -D_DEBUG -D_DLL -D_MT -Xclang --dependent-lib=msvcrtd")
+      set(_RTL_FLAGS " -D_DLL -D_MT -Xclang --dependent-lib=msvcrt")
     endif()
 
-    string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}")
-    string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}")
-    string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}")
-    string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}")
+    if(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT)
+      set(_DBG_FLAGS "")
+    else()
+      set(_DBG_FLAGS " -g -Xclang -gcodeview")
+    endif()
+
+    string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -O0${_DBG_FLAGS}${_RTL_FLAGS_DEBUG}")
+    string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG${_RTL_FLAGS}")
+    string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG${_RTL_FLAGS}")
+    string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -DNDEBUG${_DBG_FLAGS}${_RTL_FLAGS}")
+
+    set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_Embedded        -g -Xclang -gcodeview)
+    #set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_ProgramDatabase) # not supported by Clang
+    #set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_EditAndContinue) # not supported by Clang
   endif()
   set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
+  set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
 
   set(CMAKE_PCH_EXTENSION .pch)
   set(CMAKE_PCH_PROLOGUE "#pragma clang system_header")
   set(CMAKE_${lang}_COMPILE_OPTIONS_USE_PCH -Xclang -include-pch -Xclang <PCH_FILE> -Xclang -include -Xclang <PCH_HEADER>)
   set(CMAKE_${lang}_COMPILE_OPTIONS_CREATE_PCH -Xclang -emit-pch -Xclang -include -Xclang <PCH_HEADER> -x ${__pch_header_${lang}})
 
-  unset(__ADDED_FLAGS)
-  unset(__ADDED_FLAGS_DEBUG)
+  unset(_DBG_FLAGS)
+  unset(_RTL_FLAGS)
+  unset(_RTL_FLAGS_DEBUG)
   string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_LOWER)
   set(CMAKE_${lang}_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -loldnames")
 
+  # Features for LINK_LIBRARY generator expression
+  if(MSVC_VERSION GREATER "1900")
+    ## WHOLE_ARCHIVE: Force loading all members of an archive
+    set(CMAKE_${lang}_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
+    set(CMAKE_${lang}_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+  endif()
+
   enable_language(RC)
 endmacro()
 
@@ -130,24 +157,36 @@ macro(__enable_llvm_rc_preprocessing clang_option_prefix extra_pp_flags)
   endif()
 endmacro()
 
+macro(__verify_same_language_values variable)
+  foreach(lang "C" "CXX" "HIP")
+    if(DEFINED CMAKE_${lang}_${variable})
+      list(APPEND __LANGUAGE_VALUES_${variable} "${CMAKE_${lang}_${variable}}")
+    endif()
+  endforeach()
+  list(REMOVE_DUPLICATES __LANGUAGE_VALUES_${variable})
+  list(LENGTH __LANGUAGE_VALUES_${variable} __NUM_VALUES)
+
+  if(__NUM_VALUES GREATER 1)
+    message(FATAL_ERROR ${ARGN})
+  endif()
+  unset(__NUM_VALUES)
+  unset(__LANGUAGE_VALUES_${variable})
+endmacro()
 
 if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
-    OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+    OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC"
+    OR "x${CMAKE_HIP_SIMULATE_ID}" STREQUAL "xMSVC")
 
-  if ( DEFINED CMAKE_C_COMPILER_ID AND DEFINED CMAKE_CXX_COMPILER_ID
-       AND NOT "x${CMAKE_C_COMPILER_ID}" STREQUAL "x${CMAKE_CXX_COMPILER_ID}")
-    message(FATAL_ERROR "The current configuration mixes Clang and MSVC or "
-            "some other CL compatible compiler tool. This is not supported. "
-            "Use either clang or MSVC as both C and C++ compilers.")
-  endif()
+  __verify_same_language_values(COMPILER_ID
+                                "The current configuration mixes Clang and MSVC or "
+                                "some other CL compatible compiler tool. This is not supported. "
+                                "Use either clang or MSVC as both C, C++ and/or HIP compilers.")
 
-  if ( DEFINED CMAKE_C_COMPILER_FRONTEND_VARIANT AND DEFINED CMAKE_CXX_COMPILER_FRONTEND_VARIANT
-       AND NOT "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}")
-    message(FATAL_ERROR "The current configuration uses the Clang compiler "
-            "tool with mixed frontend variants, both the GNU and in MSVC CL "
-            "like variants. This is not supported. Use either clang/clang++ "
-            "or clang-cl as both C and C++ compilers.")
-  endif()
+  __verify_same_language_values(COMPILER_FRONTEND_VARIANT
+                                "The current configuration uses the Clang compiler "
+                                "tool with mixed frontend variants, both the GNU and in MSVC CL "
+                                "like variants. This is not supported. Use either clang/clang++ "
+                                "or clang-cl as both C, C++ and/or HIP compilers.")
 
   if(NOT CMAKE_RC_COMPILER_INIT)
     # Check if rc is already in the path
@@ -167,14 +206,19 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
     unset(__RC_COMPILER_PATH CACHE)
   endif()
 
-  if ( "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC" OR "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC" )
+  if ( "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC"
+      OR "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC"
+      OR "x${CMAKE_HIP_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
+
     include(Platform/Windows-MSVC)
     # Set the clang option forwarding prefix for clang-cl usage in the llvm-rc processing stage
     __enable_llvm_rc_preprocessing("-clang:" "")
     macro(__windows_compiler_clang_base lang)
       set(_COMPILE_${lang} "${_COMPILE_${lang}_MSVC}")
       __windows_compiler_msvc(${lang})
-      set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-imsvc ")
+      unset(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_EditAndContinue) # -ZI not supported by Clang
+      set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-WX")
+      set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-imsvc")
     endmacro()
   else()
     cmake_policy(GET CMP0091 __WINDOWS_CLANG_CMP0091)
@@ -185,6 +229,14 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
     endif()
     unset(__WINDOWS_CLANG_CMP0091)
 
+    cmake_policy(GET CMP0141 __WINDOWS_MSVC_CMP0141)
+    if(__WINDOWS_MSVC_CMP0141 STREQUAL "NEW")
+      set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
+    else()
+      set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT "")
+    endif()
+    unset(__WINDOWS_MSVC_CMP0141)
+
     set(CMAKE_BUILD_TYPE_INIT Debug)
 
     __enable_llvm_rc_preprocessing("" "-x c")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Embarcadero-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Embarcadero-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Embarcadero-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Embarcadero-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Embarcadero-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Embarcadero-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Embarcadero-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Embarcadero-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Embarcadero.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Embarcadero.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Embarcadero.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Embarcadero.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Flang-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Flang-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Flang-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Flang-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-G95-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-G95-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-G95-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-G95-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-C-ABI.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-C-ABI.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-C-ABI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-C-ABI.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-CXX-ABI.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-CXX-ABI.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-CXX-ABI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-CXX-ABI.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-Fortran-ABI.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-Fortran-ABI.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-Fortran-ABI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-Fortran-ABI.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU.cmake
similarity index 75%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU.cmake
index d0003803..088b238b 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-GNU.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-GNU.cmake
@@ -8,6 +8,8 @@ if(__WINDOWS_GNU)
 endif()
 set(__WINDOWS_GNU 1)
 
+set(MINGW 1)
+
 set(CMAKE_IMPORT_LIBRARY_PREFIX "lib")
 set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
 set(CMAKE_SHARED_MODULE_PREFIX  "lib")
@@ -19,16 +21,12 @@ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dll")
 set(CMAKE_SHARED_MODULE_SUFFIX  ".dll")
 set(CMAKE_STATIC_LIBRARY_SUFFIX ".a")
 
-if(MSYS OR MINGW)
-  set(CMAKE_EXTRA_LINK_EXTENSIONS ".lib") # MinGW can also link to a MS .lib
-endif()
+set(CMAKE_EXTRA_LINK_EXTENSIONS ".lib") # MinGW can also link to a MS .lib
 
-if(MINGW)
-  set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
-  set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
-  set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
-endif()
+set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib")
+set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32")
+set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 
 set(CMAKE_DL_LIBS "")
 set(CMAKE_LIBRARY_PATH_FLAG "-L")
@@ -46,23 +44,54 @@ if("${_help}" MATCHES "GNU ld .* 2\\.1[1-6]")
   set(__WINDOWS_GNU_LD_RESPONSE 0)
 endif()
 
+
+# Features for LINK_LIBRARY generator expression
+## check linker capabilities
+if(NOT DEFINED _CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  execute_process(COMMAND "${CMAKE_LINKER}" --help
+                  OUTPUT_VARIABLE __linker_help
+                  ERROR_VARIABLE __linker_help)
+  if(__linker_help MATCHES "--push-state" AND __linker_help MATCHES "--pop-state")
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED TRUE CACHE INTERNAL "linker supports push/pop state")
+  else()
+    set(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED FALSE CACHE INTERNAL "linker supports push/pop state")
+  endif()
+  unset(__linker_help)
+endif()
+## WHOLE_ARCHIVE: Force loading all members of an archive
+if(_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED)
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--push-state,--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--pop-state")
+else()
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:--whole-archive"
+                                             "<LINK_ITEM>"
+                                             "LINKER:--no-whole-archive")
+endif()
+set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+
+# Features for LINK_GROUP generator expression
+## RESCAN: request the linker to rescan static libraries until there is
+## no pending undefined symbols
+set(CMAKE_LINK_GROUP_USING_RESCAN "LINKER:--start-group" "LINKER:--end-group")
+set(CMAKE_LINK_GROUP_USING_RESCAN_SUPPORTED TRUE)
+
+
 macro(__windows_compiler_gnu lang)
 
-  if(MSYS OR MINGW)
-    # Create archiving rules to support large object file lists for static libraries.
-    set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> qc <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
-    set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
+  # Create archiving rules to support large object file lists for static libraries.
+  set(CMAKE_${lang}_ARCHIVE_CREATE "<CMAKE_AR> qc <TARGET> <LINK_FLAGS> <OBJECTS>")
+  set(CMAKE_${lang}_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
+  set(CMAKE_${lang}_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 
-    # Initialize C link type selection flags.  These flags are used when
-    # building a shared library, shared module, or executable that links
-    # to other libraries to select whether to use the static or shared
-    # versions of the libraries.
-    foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
-      set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-Bstatic")
-      set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
-    endforeach()
-  endif()
+  # Initialize C link type selection flags.  These flags are used when
+  # building a shared library, shared module, or executable that links
+  # to other libraries to select whether to use the static or shared
+  # versions of the libraries.
+  foreach(type SHARED_LIBRARY SHARED_MODULE EXE)
+    set(CMAKE_${type}_LINK_STATIC_${lang}_FLAGS "-Wl,-Bstatic")
+    set(CMAKE_${type}_LINK_DYNAMIC_${lang}_FLAGS "-Wl,-Bdynamic")
+  endforeach()
 
   # No -fPIC on Windows
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIC "")
@@ -128,7 +157,8 @@ macro(__windows_compiler_gnu lang)
   endif()
 
   if(NOT CMAKE_RC_COMPILER_INIT AND NOT CMAKE_GENERATOR_RC)
-    set(CMAKE_RC_COMPILER_INIT ${_CMAKE_TOOLCHAIN_PREFIX}windres)
+    set(_CMAKE_RC_COMPILER_LIST ${_CMAKE_TOOLCHAIN_PREFIX}windres windres)
+    set(_CMAKE_RC_COMPILER_FALLBACK windres)
   endif()
 
   enable_language(RC)
@@ -148,7 +178,7 @@ macro(__windows_compiler_gnu_abi lang)
 
     # Query the VS Installer tool for locations of VS 2017 and above.
     set(_vs_installer_paths "")
-    foreach(vs RANGE 16 15 -1) # change the first number to the largest supported version
+    foreach(vs RANGE 17 15 -1) # change the first number to the largest supported version
       cmake_host_system_information(RESULT _vs_dir QUERY VS_${vs}_DIR)
       if(_vs_dir)
         list(APPEND _vs_installer_paths "${_vs_dir}/VC/Auxiliary/Build")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-C.cmake
similarity index 62%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-C.cmake
index 152b27c3..8ae68529 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-C.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-C.cmake
@@ -1,7 +1,7 @@
 include(Platform/Windows-Intel)
 __windows_compiler_intel(C)
 
-set(CMAKE_DEPFILE_FLAGS_C "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
+set(CMAKE_DEPFILE_FLAGS_C "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
 set(CMAKE_C_DEPFILE_FORMAT gcc)
 
 if(CMAKE_GENERATOR MATCHES "^Ninja")
@@ -19,9 +19,8 @@ if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
   set(CMAKE_C_DEPENDS_USE_COMPILER TRUE)
 endif()
 
-if("${CMAKE_SOURCE_DIR}${CMAKE_BINARY_DIR}" MATCHES " ")
-  # The Intel compiler does not properly escape spaces in a depfile.
-  # Fall back to msvc depfile format.
-  set(CMAKE_DEPFILE_FLAGS_C "/showIncludes")
-  set(CMAKE_C_DEPFILE_FORMAT msvc)
-endif()
+# The Intel compiler does not properly escape spaces in a depfile which can
+# occur in source and binary cmake paths as well as external include paths.
+# Until Intel fixes this bug, fall back unconditionally to msvc depfile format.
+set(CMAKE_DEPFILE_FLAGS_C "/showIncludes")
+set(CMAKE_C_DEPFILE_FORMAT msvc)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-CXX.cmake
similarity index 63%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-CXX.cmake
index ce33ae18..e2fa2afa 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-CXX.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-CXX.cmake
@@ -2,7 +2,7 @@ include(Platform/Windows-Intel)
 set(_COMPILE_CXX " /TP")
 __windows_compiler_intel(CXX)
 
-set(CMAKE_DEPFILE_FLAGS_CXX "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
+set(CMAKE_DEPFILE_FLAGS_CXX "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
 set(CMAKE_CXX_DEPFILE_FORMAT gcc)
 
 if(CMAKE_GENERATOR MATCHES "^Ninja")
@@ -20,9 +20,8 @@ if((NOT DEFINED CMAKE_DEPENDS_USE_COMPILER OR CMAKE_DEPENDS_USE_COMPILER)
  set(CMAKE_CXX_DEPENDS_USE_COMPILER TRUE)
 endif()
 
-if("${CMAKE_SOURCE_DIR}${CMAKE_BINARY_DIR}" MATCHES " ")
-  # The Intel compiler does not properly escape spaces in a depfile.
-  # Fall back to msvc depfile format.
-  set(CMAKE_DEPFILE_FLAGS_CXX "/showIncludes")
-  set(CMAKE_CXX_DEPFILE_FORMAT msvc)
-endif()
+# The Intel compiler does not properly escape spaces in a depfile which can
+# occur in source and binary cmake paths as well as external include paths.
+# Until Intel fixes this bug, fall back unconditionally to msvc depfile format.
+set(CMAKE_DEPFILE_FLAGS_CXX "/showIncludes")
+set(CMAKE_CXX_DEPFILE_FORMAT msvc)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-Fortran.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-Fortran.cmake
index e3804fb8..c9b70d59 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-Fortran.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-Fortran.cmake
@@ -33,6 +33,8 @@ set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         -th
 set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL      -threads -libs:dll)
 set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug    -threads -libs:static -dbglibs)
 set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL -threads -libs:dll    -dbglibs)
+set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_Embedded        -Z7)
+set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_ProgramDatabase -Zi)
 
 # Intel Fortran for Windows supports single-threaded RTL but it is
 # not implemented by the Visual Studio integration.
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-ISPC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-ISPC.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel-ISPC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel-ISPC.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Intel.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Intel.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-Fortran.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-Fortran.cmake
index 06d0a00d..202ba23d 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-IntelLLVM-Fortran.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM-Fortran.cmake
@@ -33,6 +33,8 @@ set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         -th
 set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL      -threads -libs:dll)
 set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug    -threads -libs:static -dbglibs)
 set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL -threads -libs:dll    -dbglibs)
+set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_Embedded        -Z7)
+set(CMAKE_Fortran_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_ProgramDatabase -Zi)
 
 # Intel Fortran for Windows supports single-threaded RTL but it is
 # not implemented by the Visual Studio integration.
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM.cmake
new file mode 100644
index 00000000..43f5874e
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-IntelLLVM.cmake
@@ -0,0 +1,65 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# This module is shared by multiple languages; use include blocker.
+if(__WINDOWS_INTEL_LLVM)
+  return()
+endif()
+set(__WINDOWS_INTEL_LLVM 1)
+
+# Platform/Windows-MSVC adds some linking options icx/ifx do not understand,
+# but that need to be passed to the linker.  Wrap all the linking options from
+# Platform/Windows-MSVC so that the compiler will hand them off to the linker
+# without interpreting them.
+
+# Save original CMAKE_${t}_LINKER_FLAGS_INIT
+foreach(t EXE SHARED MODULE STATIC)
+  set(_saved_cmake_${t}_linker_flags_init ${CMAKE_${t}_LINKER_FLAGS_INIT})
+  set(CMAKE_${t}_LINKER_FLAGS_INIT "")
+endforeach()
+include(Platform/Windows-MSVC)
+# Wrap linker flags from Windows-MSVC
+set(_IntelLLVM_LINKER_WRAPPER_FLAG "/Qoption,link,")
+set(_IntelLLVM_LINKER_WRAPPER_FLAG_SEP ",")
+foreach(t EXE SHARED MODULE STATIC)
+  set(_wrapped_linker_flags "")
+  foreach(flag ${CMAKE_${t}_LINKER_FLAGS_INIT})
+    string(STRIP ${flag} flag)
+    list(APPEND _wrapped_linker_flags "${_IntelLLVM_LINKER_WRAPPER_FLAG}${flag}")
+  endforeach()
+  set(CMAKE_${t}_LINKER_FLAGS_INIT "")
+  list(APPEND CMAKE_${t}_LINKER_FLAGS_INIT
+    ${_saved_cmake_${t}_linker_flags_init} ${_wrapped_linker_flags})
+endforeach()
+
+macro(__windows_compiler_intel lang)
+  __windows_compiler_msvc(${lang})
+
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "${_IntelLLVM_LINKER_WRAPPER_FLAG}")
+  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP "${_IntelLLVM_LINKER_WRAPPER_FLAG_SEP}")
+  set(CMAKE_${lang}_CREATE_WIN32_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:windows")
+  set(CMAKE_${lang}_CREATE_CONSOLE_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:console")
+  set(CMAKE_LINK_DEF_FILE_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/DEF:")
+  set(CMAKE_LIBRARY_PATH_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/LIBPATH:")
+
+  # Features for LINK_LIBRARY generator expression
+  if(MSVC_VERSION GREATER "1900")
+    ## WHOLE_ARCHIVE: Force loading all members of an archive
+    set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
+    set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+  endif()
+
+  set(CMAKE_${lang}_LINK_EXECUTABLE
+    "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <LINK_LIBRARIES> /link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}")
+  set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
+    "${_CMAKE_VS_LINK_DLL}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD <LINK_FLAGS> <LINK_LIBRARIES> -link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}")
+  if (NOT "${lang}" STREQUAL "Fortran" OR CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 2022.1)
+    # The Fortran driver does not support -fuse-ld=llvm-lib before compiler version 2022.1
+    set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
+      "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -fuse-ld=llvm-lib -o <TARGET> <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
+  endif()
+
+  set(CMAKE_DEPFILE_FLAGS_${lang} "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
+  set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
+endmacro()
diff --git a/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-LLVMFlang-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-LLVMFlang-Fortran.cmake
new file mode 100644
index 00000000..64dc0da9
--- /dev/null
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-LLVMFlang-Fortran.cmake
@@ -0,0 +1,3 @@
+include(Platform/Windows-GNU)
+__windows_compiler_gnu(Fortran)
+# TODO: MSVC ABI Support
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-MSVC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-MSVC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-MSVC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-MSVC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-MSVC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-MSVC-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-MSVC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-MSVC-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-MSVC.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-MSVC.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-MSVC.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-MSVC.cmake
index 4223bde8..8e96bf44 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-MSVC.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-MSVC.cmake
@@ -67,7 +67,10 @@ if(NOT MSVC_VERSION)
     message(FATAL_ERROR "MSVC compiler version not detected properly: ${_compiler_version}")
   endif()
 
-  if(MSVC_VERSION GREATER_EQUAL 1920)
+  if(MSVC_VERSION GREATER_EQUAL 1930)
+    # VS 2022 or greater
+    set(MSVC_TOOLSET_VERSION 143)
+  elseif(MSVC_VERSION GREATER_EQUAL 1920)
     # VS 2019 or greater
     set(MSVC_TOOLSET_VERSION 142)
   elseif(MSVC_VERSION GREATER_EQUAL 1910)
@@ -223,7 +226,7 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
 else()
   set(_PLATFORM_DEFINES "/DWIN32")
   if((_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM64EC") OR (_MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM64EC"))
-    set(_PLATFORM_DEFINES "${_PLATFORM_DEFINES} /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC /D_ARM64EC_WORKAROUND_")
+    set(_PLATFORM_DEFINES "${_PLATFORM_DEFINES} /D_AMD64_ /DAMD64 /D_ARM64EC_ /DARM64EC")
   endif()
   if(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
@@ -243,6 +246,10 @@ else()
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
   endif()
 
+  if((_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM64EC") OR (_MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM64EC"))
+    string(APPEND CMAKE_C_STANDARD_LIBRARIES_INIT " softintrin.lib")
+  endif()
+
   if(MSVC_VERSION LESS 1310)
     set(_FLAGS_C   " /Zm1000${_FLAGS_C}")
     set(_FLAGS_CXX " /Zm1000${_FLAGS_CXX}")
@@ -324,6 +331,22 @@ else()
 endif()
 unset(__WINDOWS_MSVC_CMP0091)
 
+cmake_policy(GET CMP0141 __WINDOWS_MSVC_CMP0141)
+if(__WINDOWS_MSVC_CMP0141 STREQUAL "NEW")
+  set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT "$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>")
+else()
+  set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT "")
+endif()
+unset(__WINDOWS_MSVC_CMP0141)
+
+# Features for LINK_LIBRARY generator expression
+if(MSVC_VERSION GREATER "1900")
+  ## WHOLE_ARCHIVE: Force loading all members of an archive
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "/WHOLEARCHIVE:<LIBRARY>")
+  set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+endif()
+
+
 macro(__windows_compiler_msvc lang)
   if(NOT MSVC_VERSION LESS 1400)
     # for 2005 make sure the manifest is put in the dll with mt
@@ -425,6 +448,12 @@ macro(__windows_compiler_msvc lang)
     endif()
     unset(_cmp0092)
 
+    if(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT)
+      set(_Zi "")
+    else()
+      set(_Zi " /Zi")
+    endif()
+
     if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*")
       # note: MSVC 14 2015 Update 1 sets -fno-ms-compatibility by default, but this does not allow one to compile many projects
       # that include MS's own headers. CMake itself is affected project too.
@@ -435,20 +464,24 @@ macro(__windows_compiler_msvc lang)
       string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "${_MD} -DNDEBUG") # TODO: Add '-Os' once VS generator maps it properly for Clang
     else()
       string(APPEND CMAKE_${lang}_FLAGS_INIT " ${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} /D_WINDOWS${_W3}${_FLAGS_${lang}}")
-      string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT "${_MDd} /Zi /Ob0 /Od ${_RTC1}")
+      string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT "${_MDd}${_Zi} /Ob0 /Od ${_RTC1}")
       string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT "${_MD} /O2 /Ob2 /DNDEBUG")
-      string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "${_MD} /Zi /O2 /Ob1 /DNDEBUG")
+      string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "${_MD}${_Zi} /O2 /Ob1 /DNDEBUG")
       string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "${_MD} /O1 /Ob1 /DNDEBUG")
     endif()
     unset(_Wall)
     unset(_W3)
     unset(_MDd)
     unset(_MD)
+    unset(_Zi)
 
     set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         -MT)
     set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL      -MD)
     set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug    -MTd)
     set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL -MDd)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_Embedded        -Z7)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_ProgramDatabase -Zi)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_EditAndContinue -ZI)
   endif()
   set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
 
@@ -475,7 +508,7 @@ macro(__windows_compiler_msvc_enable_rc flags)
   endif()
 
   enable_language(RC)
-  if(NOT DEFINED CMAKE_NINJA_CMCLDEPS_RC)
+  if(NOT DEFINED CMAKE_NINJA_CMCLDEPS_RC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     set(CMAKE_NINJA_CMCLDEPS_RC 1)
   endif()
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-NVIDIA-CUDA.cmake
similarity index 86%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-NVIDIA-CUDA.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-NVIDIA-CUDA.cmake
index b83932ed..326e7155 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-NVIDIA-CUDA.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-NVIDIA-CUDA.cmake
@@ -1,11 +1,7 @@
 include(Platform/Windows-MSVC)
 
-set(CMAKE_CUDA_COMPILE_PTX_COMPILATION
-  "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} -ptx <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
-set(CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION
-  "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} -dc <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
-set(CMAKE_CUDA_COMPILE_WHOLE_COMPILATION
-  "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} -c <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
+set(CMAKE_CUDA_COMPILE_OBJECT
+  "<CMAKE_CUDA_COMPILER> ${_CMAKE_CUDA_EXTRA_FLAGS} <DEFINES> <INCLUDES> <FLAGS> ${_CMAKE_COMPILE_AS_CUDA_FLAG} <CUDA_COMPILE_MODE> <SOURCE> -o <OBJECT> -Xcompiler=-Fd<TARGET_COMPILE_PDB>,-FS")
 
 set(__IMPLICIT_LINKS)
 foreach(dir ${CMAKE_CUDA_HOST_IMPLICIT_LINK_DIRECTORIES})
@@ -61,6 +57,12 @@ else()
   set(_MD "-MD ")
 endif()
 
+if(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT_DEFAULT)
+  set(_Zi "")
+else()
+  set(_Zi " -Zi")
+endif()
+
 cmake_policy(GET CMP0092 _cmp0092)
 if(_cmp0092 STREQUAL "NEW")
   set(_W3 "")
@@ -70,11 +72,12 @@ endif()
 unset(_cmp0092)
 
 string(APPEND CMAKE_CUDA_FLAGS_INIT " ${PLATFORM_DEFINES_CUDA} -D_WINDOWS -Xcompiler=\"${_W3}${_FLAGS_CXX}\"")
-string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=\"${_MDd}-Zi -Ob0 -Od ${_RTC1}\"")
+string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=\"${_MDd}${_Zi} -Ob0 -Od ${_RTC1}\"")
 string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -Xcompiler=\"${_MD}-O2 -Ob2\" -DNDEBUG")
-string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -Xcompiler=\"${_MD}-Zi -O2 -Ob1\" -DNDEBUG")
+string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -Xcompiler=\"${_MD}${_Zi} -O2 -Ob1\" -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Xcompiler=\"${_MD}-O1 -Ob1\" -DNDEBUG")
 unset(_W3)
+unset(_Zi)
 unset(_MDd)
 unset(_MD)
 
@@ -82,6 +85,9 @@ set(CMAKE_CUDA_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded         -Xcomp
 set(CMAKE_CUDA_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL      -Xcompiler=-MD)
 set(CMAKE_CUDA_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebug    -Xcompiler=-MTd)
 set(CMAKE_CUDA_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDebugDLL -Xcompiler=-MDd)
+set(CMAKE_CUDA_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_Embedded        -Xcompiler=-Z7)
+set(CMAKE_CUDA_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_ProgramDatabase -Xcompiler=-Zi)
+set(CMAKE_CUDA_COMPILE_OPTIONS_MSVC_DEBUG_INFORMATION_FORMAT_EditAndContinue -Xcompiler=-ZI)
 
 set(CMAKE_CUDA_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-OpenWatcom-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-OpenWatcom-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-OpenWatcom-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-OpenWatcom-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-OpenWatcom-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-OpenWatcom-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-OpenWatcom-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-OpenWatcom-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-OpenWatcom.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-OpenWatcom.cmake
similarity index 57%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-OpenWatcom.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-OpenWatcom.cmake
index 19bcb970..657a923a 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-OpenWatcom.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-OpenWatcom.cmake
@@ -14,11 +14,20 @@ set(CMAKE_SHARED_LIBRARY_C_FLAGS "-bd") # ... while this is a space separated st
 
 set(CMAKE_RC_COMPILER "rc" )
 
-# single/multi-threaded                 /-bm
-# static/DLL run-time libraries         /-br
-# default is setup for multi-threaded + DLL run-time libraries
-string(APPEND CMAKE_C_FLAGS_INIT " -bt=nt -dWIN32 -br -bm")
-string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=nt -xs -dWIN32 -br -bm")
+cmake_policy(GET CMP0136 __WINDOWS_WATCOM_CMP0136)
+if(__WINDOWS_WATCOM_CMP0136 STREQUAL "NEW")
+  set(CMAKE_WATCOM_RUNTIME_LIBRARY_DEFAULT "MultiThreadedDLL")
+  set(_br_bm "")
+else()
+  set(CMAKE_WATCOM_RUNTIME_LIBRARY_DEFAULT "")
+  set(_br_bm "-br -bm")
+endif()
+
+string(APPEND CMAKE_C_FLAGS_INIT " -bt=nt -dWIN32 ${_br_bm}")
+string(APPEND CMAKE_CXX_FLAGS_INIT " -bt=nt -xs -dWIN32 ${_br_bm}")
+
+unset(__WINDOWS_WATCOM_CMP0136)
+unset(_br_bm)
 
 if(CMAKE_CROSSCOMPILING)
   if(NOT CMAKE_C_STANDARD_INCLUDE_DIRECTORIES)
@@ -32,4 +41,9 @@ endif()
 macro(__windows_open_watcom lang)
   set(CMAKE_${lang}_CREATE_WIN32_EXE "system nt_win")
   set(CMAKE_${lang}_CREATE_CONSOLE_EXE "system nt")
+
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreaded         "")
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_SingleThreadedDLL      -br)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreaded          -bm)
+  set(CMAKE_${lang}_COMPILE_OPTIONS_WATCOM_RUNTIME_LIBRARY_MultiThreadedDLL       -bm -br)
 endmacro()
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-PGI-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-PGI-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-PGI-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-PGI-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-PGI-Fortran.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-PGI-Fortran.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-PGI-Fortran.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-PGI-Fortran.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-PGI.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-PGI.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-PGI.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-PGI.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Watcom-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Watcom-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Watcom-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Watcom-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Watcom-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Watcom-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-Watcom-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-Watcom-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-df.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-df.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-df.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-df.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows-windres.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows-windres.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows-windres.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows-windres.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Windows.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Windows.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Windows.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Windows.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsCE-MSVC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsCE-MSVC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsCE-MSVC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsCE-MSVC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsCE-MSVC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsCE-MSVC-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsCE-MSVC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsCE-MSVC-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsCE.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsCE.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsCE.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsCE.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPaths.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPaths.cmake
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPaths.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPaths.cmake
index b9e2f179..de93338c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPaths.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPaths.cmake
@@ -67,6 +67,7 @@ if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
     )
   endif()
 endif()
+_cmake_record_install_prefix()
 
 if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
   # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-Clang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-Clang-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-Clang-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-Clang-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-GNU-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-GNU-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-GNU-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-GNU-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-MSVC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-MSVC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-MSVC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-MSVC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-MSVC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone-MSVC-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsPhone.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsPhone.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-Clang-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-Clang-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-Clang-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-Clang-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-Clang-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-Clang-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-Clang-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-Clang-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-Clang-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-Clang-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-Clang-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-Clang-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-GNU-ASM.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-GNU-ASM.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-GNU-ASM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-GNU-ASM.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-GNU-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-GNU-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-GNU-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-GNU-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-GNU-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-GNU-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-GNU-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-GNU-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-MSVC-C.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-MSVC-C.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-MSVC-C.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-MSVC-C.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-MSVC-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-MSVC-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore-MSVC-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore-MSVC-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/WindowsStore.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/WindowsStore.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/Xenix.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/Xenix.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/Xenix.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/Xenix.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/eCos.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/eCos.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/eCos.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/eCos.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/gas.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/gas.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/gas.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/gas.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/iOS-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/iOS-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/iOS-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/iOS-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/iOS-Initialize.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/iOS-Initialize.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/iOS-Initialize.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/iOS-Initialize.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/iOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/iOS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/iOS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/iOS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/kFreeBSD.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/kFreeBSD.cmake
similarity index 53%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/kFreeBSD.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/kFreeBSD.cmake
index c1db2594..09c240dc 100644
--- a/deps/cmake/share/cmake-3.21/Modules/Platform/kFreeBSD.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/Platform/kFreeBSD.cmake
@@ -1,4 +1,5 @@
-# kFreeBSD looks just like Linux.
+# kFreeBSD is a Debian GNU distribution with a kernel from FreeBSD,
+# and should be marked as LINUX
 include(Platform/Linux)
 
 set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-kfreebsd-gnu[a-z0-9_]*")
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/syllable.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/syllable.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/syllable.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/syllable.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/tvOS-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/tvOS-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/tvOS-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/tvOS-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/tvOS-Initialize.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/tvOS-Initialize.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/tvOS-Initialize.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/tvOS-Initialize.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/tvOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/tvOS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/tvOS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/tvOS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/watchOS-Determine-CXX.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/watchOS-Determine-CXX.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/watchOS-Determine-CXX.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/watchOS-Determine-CXX.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/watchOS-Initialize.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/watchOS-Initialize.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/watchOS-Initialize.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/watchOS-Initialize.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Platform/watchOS.cmake b/deps/cmake/share/cmake-3.25/Modules/Platform/watchOS.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Platform/watchOS.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Platform/watchOS.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/ProcessorCount.cmake b/deps/cmake/share/cmake-3.25/Modules/ProcessorCount.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/ProcessorCount.cmake
rename to deps/cmake/share/cmake-3.25/Modules/ProcessorCount.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Qt4ConfigDependentSettings.cmake b/deps/cmake/share/cmake-3.25/Modules/Qt4ConfigDependentSettings.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Qt4ConfigDependentSettings.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Qt4ConfigDependentSettings.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Qt4Macros.cmake b/deps/cmake/share/cmake-3.25/Modules/Qt4Macros.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Qt4Macros.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Qt4Macros.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/SelectLibraryConfigurations.cmake b/deps/cmake/share/cmake-3.25/Modules/SelectLibraryConfigurations.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/SelectLibraryConfigurations.cmake
rename to deps/cmake/share/cmake-3.25/Modules/SelectLibraryConfigurations.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Squish4RunTestCase.bat b/deps/cmake/share/cmake-3.25/Modules/Squish4RunTestCase.bat
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Squish4RunTestCase.bat
rename to deps/cmake/share/cmake-3.25/Modules/Squish4RunTestCase.bat
diff --git a/deps/cmake/share/cmake-3.21/Modules/Squish4RunTestCase.sh b/deps/cmake/share/cmake-3.25/Modules/Squish4RunTestCase.sh
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Squish4RunTestCase.sh
rename to deps/cmake/share/cmake-3.25/Modules/Squish4RunTestCase.sh
diff --git a/deps/cmake/share/cmake-3.21/Modules/SquishRunTestCase.bat b/deps/cmake/share/cmake-3.25/Modules/SquishRunTestCase.bat
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/SquishRunTestCase.bat
rename to deps/cmake/share/cmake-3.25/Modules/SquishRunTestCase.bat
diff --git a/deps/cmake/share/cmake-3.21/Modules/SquishRunTestCase.sh b/deps/cmake/share/cmake-3.25/Modules/SquishRunTestCase.sh
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/SquishRunTestCase.sh
rename to deps/cmake/share/cmake-3.25/Modules/SquishRunTestCase.sh
diff --git a/deps/cmake/share/cmake-3.21/Modules/SquishTestScript.cmake b/deps/cmake/share/cmake-3.25/Modules/SquishTestScript.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/SquishTestScript.cmake
rename to deps/cmake/share/cmake-3.25/Modules/SquishTestScript.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/SystemInformation.cmake b/deps/cmake/share/cmake-3.25/Modules/SystemInformation.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/SystemInformation.cmake
rename to deps/cmake/share/cmake-3.25/Modules/SystemInformation.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/SystemInformation.in b/deps/cmake/share/cmake-3.25/Modules/SystemInformation.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/SystemInformation.in
rename to deps/cmake/share/cmake-3.25/Modules/SystemInformation.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestBigEndian.cmake b/deps/cmake/share/cmake-3.25/Modules/TestBigEndian.cmake
similarity index 89%
rename from deps/cmake/share/cmake-3.21/Modules/TestBigEndian.cmake
rename to deps/cmake/share/cmake-3.25/Modules/TestBigEndian.cmake
index ea8ca73b..096c90c3 100644
--- a/deps/cmake/share/cmake-3.21/Modules/TestBigEndian.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/TestBigEndian.cmake
@@ -77,20 +77,16 @@ macro(__TEST_BIG_ENDIAN_LEGACY_IMPL VARIABLE)
     endif()
 
     if(_test_language STREQUAL "CXX")
-      set(_test_file "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/TestEndianess.cpp")
+      set(_test_file TestEndianess.cpp)
     else()
-      set(_test_file "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/TestEndianess.c")
+      set(_test_file TestEndianess.c)
     endif()
 
-    configure_file("${CMAKE_ROOT}/Modules/TestEndianess.c.in"
-                   ${_test_file}
-                   @ONLY)
-
-     file(READ ${_test_file} TEST_ENDIANESS_FILE_CONTENT)
+    file(READ "${CMAKE_ROOT}/Modules/TestEndianess.c.in" TEST_ENDIANESS_FILE_CONTENT)
+    string(CONFIGURE "${TEST_ENDIANESS_FILE_CONTENT}" TEST_ENDIANESS_FILE_CONTENT @ONLY)
 
      try_compile(HAVE_${VARIABLE}
-      "${CMAKE_BINARY_DIR}"
-      ${_test_file}
+      SOURCE_FROM_VAR "${_test_file}" TEST_ENDIANESS_FILE_CONTENT
       OUTPUT_VARIABLE OUTPUT
       COPY_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestEndianess.bin" )
 
@@ -131,12 +127,12 @@ macro(__TEST_BIG_ENDIAN_LEGACY_IMPL VARIABLE)
         endif()
 
         file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-          "Determining if the system is big endian passed with the following output:\n${OUTPUT}\nTestEndianess.c:\n${TEST_ENDIANESS_FILE_CONTENT}\n\n")
+          "Determining if the system is big endian passed with the following output:\n${OUTPUT}\n${_test_file}:\n${TEST_ENDIANESS_FILE_CONTENT}\n\n")
 
       else()
         message(CHECK_FAIL "failed")
         file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-          "Determining if the system is big endian failed with the following output:\n${OUTPUT}\nTestEndianess.c:\n${TEST_ENDIANESS_FILE_CONTENT}\n\n")
+          "Determining if the system is big endian failed with the following output:\n${OUTPUT}\n${_test_file}:\n${TEST_ENDIANESS_FILE_CONTENT}\n\n")
         set(${VARIABLE})
       endif()
   endif()
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestCXXAcceptsFlag.cmake b/deps/cmake/share/cmake-3.25/Modules/TestCXXAcceptsFlag.cmake
similarity index 95%
rename from deps/cmake/share/cmake-3.21/Modules/TestCXXAcceptsFlag.cmake
rename to deps/cmake/share/cmake-3.25/Modules/TestCXXAcceptsFlag.cmake
index ce505f3c..2e511ae1 100644
--- a/deps/cmake/share/cmake-3.21/Modules/TestCXXAcceptsFlag.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/TestCXXAcceptsFlag.cmake
@@ -25,8 +25,7 @@ macro(CHECK_CXX_ACCEPTS_FLAG FLAGS  VARIABLE)
   if(NOT DEFINED ${VARIABLE})
     message(CHECK_START "Checking to see if CXX compiler accepts flag ${FLAGS}")
     try_compile(${VARIABLE}
-      ${CMAKE_BINARY_DIR}
-      ${CMAKE_ROOT}/Modules/DummyCXXFile.cxx
+      SOURCES ${CMAKE_ROOT}/Modules/DummyCXXFile.cxx
       CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${FLAGS}
       OUTPUT_VARIABLE OUTPUT)
     if(${VARIABLE})
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestEndianess.c.in b/deps/cmake/share/cmake-3.25/Modules/TestEndianess.c.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/TestEndianess.c.in
rename to deps/cmake/share/cmake-3.25/Modules/TestEndianess.c.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForANSIForScope.cmake b/deps/cmake/share/cmake-3.25/Modules/TestForANSIForScope.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/TestForANSIForScope.cmake
rename to deps/cmake/share/cmake-3.25/Modules/TestForANSIForScope.cmake
index 0f2dc013..06db586f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/TestForANSIForScope.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/TestForANSIForScope.cmake
@@ -17,8 +17,8 @@ for-init-statement to the loop body.
 
 if(NOT DEFINED CMAKE_ANSI_FOR_SCOPE)
   message(CHECK_START "Check for ANSI scope")
-  try_compile(CMAKE_ANSI_FOR_SCOPE  ${CMAKE_BINARY_DIR}
-    ${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx
+  try_compile(CMAKE_ANSI_FOR_SCOPE
+    SOURCES ${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx
     OUTPUT_VARIABLE OUTPUT)
   if (CMAKE_ANSI_FOR_SCOPE)
     message(CHECK_PASS "found")
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForANSIStreamHeaders.cmake b/deps/cmake/share/cmake-3.25/Modules/TestForANSIStreamHeaders.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/TestForANSIStreamHeaders.cmake
rename to deps/cmake/share/cmake-3.25/Modules/TestForANSIStreamHeaders.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForANSIStreamHeaders.cxx b/deps/cmake/share/cmake-3.25/Modules/TestForANSIStreamHeaders.cxx
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/TestForANSIStreamHeaders.cxx
rename to deps/cmake/share/cmake-3.25/Modules/TestForANSIStreamHeaders.cxx
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForAnsiForScope.cxx b/deps/cmake/share/cmake-3.25/Modules/TestForAnsiForScope.cxx
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/TestForAnsiForScope.cxx
rename to deps/cmake/share/cmake-3.25/Modules/TestForAnsiForScope.cxx
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForSSTREAM.cmake b/deps/cmake/share/cmake-3.25/Modules/TestForSSTREAM.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/TestForSSTREAM.cmake
rename to deps/cmake/share/cmake-3.25/Modules/TestForSSTREAM.cmake
index 545b7ec2..9a09ac7f 100644
--- a/deps/cmake/share/cmake-3.21/Modules/TestForSSTREAM.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/TestForSSTREAM.cmake
@@ -16,8 +16,8 @@ check if the compiler supports the standard ANSI sstream header
 
 if(NOT DEFINED CMAKE_HAS_ANSI_STRING_STREAM)
   message(CHECK_START "Check for sstream")
-  try_compile(CMAKE_HAS_ANSI_STRING_STREAM  ${CMAKE_BINARY_DIR}
-    ${CMAKE_ROOT}/Modules/TestForSSTREAM.cxx
+  try_compile(CMAKE_HAS_ANSI_STRING_STREAM
+    SOURCES ${CMAKE_ROOT}/Modules/TestForSSTREAM.cxx
     OUTPUT_VARIABLE OUTPUT)
   if (CMAKE_HAS_ANSI_STRING_STREAM)
     message(CHECK_PASS "found")
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForSSTREAM.cxx b/deps/cmake/share/cmake-3.25/Modules/TestForSSTREAM.cxx
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/TestForSSTREAM.cxx
rename to deps/cmake/share/cmake-3.25/Modules/TestForSSTREAM.cxx
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForSTDNamespace.cmake b/deps/cmake/share/cmake-3.25/Modules/TestForSTDNamespace.cmake
similarity index 92%
rename from deps/cmake/share/cmake-3.21/Modules/TestForSTDNamespace.cmake
rename to deps/cmake/share/cmake-3.25/Modules/TestForSTDNamespace.cmake
index d101c833..cd9c7827 100644
--- a/deps/cmake/share/cmake-3.21/Modules/TestForSTDNamespace.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/TestForSTDNamespace.cmake
@@ -16,8 +16,8 @@ check if the compiler supports std:: on stl classes
 
 if(NOT DEFINED CMAKE_STD_NAMESPACE)
   message(CHECK_START "Check for STD namespace")
-  try_compile(CMAKE_STD_NAMESPACE  ${CMAKE_BINARY_DIR}
-    ${CMAKE_ROOT}/Modules/TestForSTDNamespace.cxx
+  try_compile(CMAKE_STD_NAMESPACE
+    SOURCES ${CMAKE_ROOT}/Modules/TestForSTDNamespace.cxx
     OUTPUT_VARIABLE OUTPUT)
   if (CMAKE_STD_NAMESPACE)
     message(CHECK_PASS "found")
diff --git a/deps/cmake/share/cmake-3.21/Modules/TestForSTDNamespace.cxx b/deps/cmake/share/cmake-3.25/Modules/TestForSTDNamespace.cxx
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/TestForSTDNamespace.cxx
rename to deps/cmake/share/cmake-3.25/Modules/TestForSTDNamespace.cxx
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseEcos.cmake b/deps/cmake/share/cmake-3.25/Modules/UseEcos.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UseEcos.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseEcos.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseJava.cmake b/deps/cmake/share/cmake-3.25/Modules/UseJava.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/UseJava.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseJava.cmake
index ef63ac34..1511bfd5 100644
--- a/deps/cmake/share/cmake-3.21/Modules/UseJava.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/UseJava.cmake
@@ -294,7 +294,7 @@ Header Generation
 
   .. deprecated:: 3.11
     This command will no longer be supported starting with version 10 of the JDK
-    due to the `suppression of javah tool <http://openjdk.java.net/jeps/313>`_.
+    due to the `suppression of javah tool <https://openjdk.java.net/jeps/313>`_.
     The :ref:`add_jar(GENERATE_NATIVE_HEADERS) <add_jar>` command should be
     used instead.
 
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseJava/ClassFilelist.cmake b/deps/cmake/share/cmake-3.25/Modules/UseJava/ClassFilelist.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UseJava/ClassFilelist.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseJava/ClassFilelist.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseJava/ClearClassFiles.cmake b/deps/cmake/share/cmake-3.25/Modules/UseJava/ClearClassFiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UseJava/ClearClassFiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseJava/ClearClassFiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseJava/Symlinks.cmake b/deps/cmake/share/cmake-3.25/Modules/UseJava/Symlinks.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UseJava/Symlinks.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseJava/Symlinks.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseJava/javaTargets.cmake.in b/deps/cmake/share/cmake-3.25/Modules/UseJava/javaTargets.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UseJava/javaTargets.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/UseJava/javaTargets.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/UsePkgConfig.cmake b/deps/cmake/share/cmake-3.25/Modules/UsePkgConfig.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UsePkgConfig.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UsePkgConfig.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseQt4.cmake b/deps/cmake/share/cmake-3.25/Modules/UseQt4.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UseQt4.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseQt4.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseSWIG.cmake b/deps/cmake/share/cmake-3.25/Modules/UseSWIG.cmake
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Modules/UseSWIG.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseSWIG.cmake
index 5c8f152b..fd6596b8 100644
--- a/deps/cmake/share/cmake-3.21/Modules/UseSWIG.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/UseSWIG.cmake
@@ -192,12 +192,17 @@ ensure generated files will receive the required settings.
   If set to ``TRUE``, implicit dependencies are generated by the ``swig`` tool
   itself. This property is only meaningful for
   :ref:`Makefile <Makefile Generators>`,
-  :ref:`Ninja <Ninja Generators>` and :generator:`Xcode` generators. Default
-  value is ``FALSE``.
+  :ref:`Ninja <Ninja Generators>`, :generator:`Xcode`, and
+  :ref:`Visual Studio <Visual Studio Generators>`
+  (:generator:`Visual Studio 11 2012` and above) generators. Default value is
+  ``FALSE``.
 
   .. versionadded:: 3.21
     Added the support of :generator:`Xcode` generator.
 
+  .. versionadded:: 3.22
+    Added the support of :ref:`Visual Studio Generators`.
+
 ``SWIG_MODULE_NAME``
   Specify the actual import name of the module in the target language.
   This is required if it cannot be scanned automatically from source
@@ -342,8 +347,10 @@ as well as ``SWIG``:
   If set to ``TRUE``, implicit dependencies are generated by the ``swig`` tool
   itself. This variable is only meaningful for
   :ref:`Makefile <Makefile Generators>`,
-  :ref:`Ninja <Ninja Generators>` and :generator:`Xcode` generators. Default
-  value is ``FALSE``.
+  :ref:`Ninja <Ninja Generators>`, :generator:`Xcode`, and
+  :ref:`Visual Studio <Visual Studio Generators>`
+  (:generator:`Visual Studio 11 2012` and above) generators. Default value is
+  ``FALSE``.
 
   Source file property ``USE_SWIG_DEPENDENCIES``, if not defined, will be
   initialized with the value of this variable.
@@ -351,6 +358,9 @@ as well as ``SWIG``:
   .. versionadded:: 3.21
     Added the support of :generator:`Xcode` generator.
 
+  .. versionadded:: 3.22
+    Added the support of :ref:`Visual Studio Generators`.
+
 #]=======================================================================]
 
 cmake_policy(PUSH)
@@ -367,6 +377,7 @@ set(SWIG_EXTRA_LIBRARIES "")
 set(SWIG_PYTHON_EXTRA_FILE_EXTENSIONS ".py")
 set(SWIG_JAVA_EXTRA_FILE_EXTENSIONS ".java" "JNI.java")
 set(SWIG_CSHARP_EXTRA_FILE_EXTENSIONS ".cs" "PINVOKE.cs")
+set(SWIG_PERL_EXTRA_FILE_EXTENSIONS ".pm")
 
 set(SWIG_MANAGE_SUPPORT_FILES_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/UseSWIG/ManageSupportFiles.cmake")
 
@@ -515,7 +526,7 @@ function(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   endif()
 
   set (use_swig_dependencies ${SWIG_USE_SWIG_DEPENDENCIES})
-  if (CMAKE_GENERATOR MATCHES "Make|Ninja|Xcode")
+  if (CMAKE_GENERATOR MATCHES "Make|Ninja|Xcode|Visual Studio (1[1-9]|[2-9][0-9])")
     get_property(use_swig_dependencies_set SOURCE "${infile}" PROPERTY USE_SWIG_DEPENDENCIES SET)
     if (use_swig_dependencies_set)
       get_property(use_swig_dependencies SOURCE "${infile}" PROPERTY USE_SWIG_DEPENDENCIES)
@@ -676,7 +687,7 @@ function(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
     ${swig_custom_products}
     ${swig_cleanup_command}
     # Let's create the ${outdir} at execution time, in case dir contains $(OutDir)
-    COMMAND "${CMAKE_COMMAND}" -E make_directory ${outdir} ${outfiledir}
+    COMMAND "${CMAKE_COMMAND}" -E make_directory "${workingdir}" "${outdir}" "${outfiledir}"
     ${swig_timestamp_command}
     COMMAND "${CMAKE_COMMAND}" -E env "SWIG_LIB=${SWIG_DIR}" "${SWIG_EXECUTABLE}"
     "-${SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG}"
@@ -840,8 +851,9 @@ function(SWIG_ADD_LIBRARY name)
     set(SWIG_SOURCE_FILE_EXTENSIONS ".i")
   endif()
 
-  if (CMAKE_GENERATOR MATCHES "Make|Ninja|Xcode")
-    # For Makefiles and Ninja generators, use SWIG generated dependencies
+  if (CMAKE_GENERATOR MATCHES "Make|Ninja|Xcode|Visual Studio (1[1-9]|[2-9][0-9])")
+    # For Makefiles, Ninja, Xcode and Visual Studio generators,
+    # use SWIG generated dependencies if requested
     if (NOT DEFINED SWIG_USE_SWIG_DEPENDENCIES)
         set (SWIG_USE_SWIG_DEPENDENCIES OFF)
     endif()
@@ -978,6 +990,9 @@ function(SWIG_ADD_LIBRARY name)
       endif()
       set_target_properties (${target_name} PROPERTIES PREFIX "")
     endif()
+    if (APPLE)
+      set_target_properties (${target_name} PROPERTIES SUFFIX ".dylib")
+    endif ()
   else()
     # assume empty prefix because we expect the module to be dynamically loaded
     set_target_properties (${target_name} PROPERTIES PREFIX "")
diff --git a/deps/cmake/share/cmake-3.21/Modules/UseSWIG/ManageSupportFiles.cmake b/deps/cmake/share/cmake-3.25/Modules/UseSWIG/ManageSupportFiles.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UseSWIG/ManageSupportFiles.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UseSWIG/ManageSupportFiles.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/Use_wxWindows.cmake b/deps/cmake/share/cmake-3.25/Modules/Use_wxWindows.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/Use_wxWindows.cmake
rename to deps/cmake/share/cmake-3.25/Modules/Use_wxWindows.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/UsewxWidgets.cmake b/deps/cmake/share/cmake-3.25/Modules/UsewxWidgets.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/UsewxWidgets.cmake
rename to deps/cmake/share/cmake-3.25/Modules/UsewxWidgets.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/VTKCompatibility.cmake b/deps/cmake/share/cmake-3.25/Modules/VTKCompatibility.cmake
similarity index 94%
rename from deps/cmake/share/cmake-3.21/Modules/VTKCompatibility.cmake
rename to deps/cmake/share/cmake-3.25/Modules/VTKCompatibility.cmake
index 1b0815e8..4ee7643c 100644
--- a/deps/cmake/share/cmake-3.21/Modules/VTKCompatibility.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/VTKCompatibility.cmake
@@ -1,6 +1,10 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
+# Not needed for "modern" VTK.
+if (EXISTS "${VTK_SOURCE_DIR}/CMake/vtkModule.cmake")
+  return ()
+endif ()
 
 if(APPLE)
   set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY}")
diff --git a/deps/cmake/share/cmake-3.21/Modules/WriteBasicConfigVersionFile.cmake b/deps/cmake/share/cmake-3.25/Modules/WriteBasicConfigVersionFile.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/WriteBasicConfigVersionFile.cmake
rename to deps/cmake/share/cmake-3.25/Modules/WriteBasicConfigVersionFile.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/WriteCompilerDetectionHeader.cmake b/deps/cmake/share/cmake-3.25/Modules/WriteCompilerDetectionHeader.cmake
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Modules/WriteCompilerDetectionHeader.cmake
rename to deps/cmake/share/cmake-3.25/Modules/WriteCompilerDetectionHeader.cmake
index 54eb40ed..0e4e0280 100644
--- a/deps/cmake/share/cmake-3.21/Modules/WriteCompilerDetectionHeader.cmake
+++ b/deps/cmake/share/cmake-3.25/Modules/WriteCompilerDetectionHeader.cmake
@@ -384,7 +384,6 @@ elseif(_WCDH_policy STREQUAL "")
     )
 endif()
 
-set(__skip_rocmclang TRUE)
 include(${CMAKE_CURRENT_LIST_DIR}/CMakeCompilerIdDetection.cmake)
 
 function(_load_compiler_variables CompilerId lang)
diff --git a/deps/cmake/share/cmake-3.21/Modules/ecos_clean.cmake b/deps/cmake/share/cmake-3.25/Modules/ecos_clean.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/ecos_clean.cmake
rename to deps/cmake/share/cmake-3.25/Modules/ecos_clean.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/exportheader.cmake.in b/deps/cmake/share/cmake-3.25/Modules/exportheader.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/exportheader.cmake.in
rename to deps/cmake/share/cmake-3.25/Modules/exportheader.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/kde3init_dummy.cpp.in b/deps/cmake/share/cmake-3.25/Modules/kde3init_dummy.cpp.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/kde3init_dummy.cpp.in
rename to deps/cmake/share/cmake-3.25/Modules/kde3init_dummy.cpp.in
diff --git a/deps/cmake/share/cmake-3.21/Modules/kde3uic.cmake b/deps/cmake/share/cmake-3.25/Modules/kde3uic.cmake
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/kde3uic.cmake
rename to deps/cmake/share/cmake-3.25/Modules/kde3uic.cmake
diff --git a/deps/cmake/share/cmake-3.21/Modules/readme.txt b/deps/cmake/share/cmake-3.25/Modules/readme.txt
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Modules/readme.txt
rename to deps/cmake/share/cmake-3.25/Modules/readme.txt
diff --git a/deps/cmake/share/cmake-3.21/Templates/AppleInfo.plist b/deps/cmake/share/cmake-3.25/Templates/AppleInfo.plist
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/AppleInfo.plist
rename to deps/cmake/share/cmake-3.25/Templates/AppleInfo.plist
diff --git a/deps/cmake/share/cmake-3.21/Templates/CMakeVSMacros1.vsmacros b/deps/cmake/share/cmake-3.25/Templates/CMakeVSMacros1.vsmacros
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/CMakeVSMacros1.vsmacros
rename to deps/cmake/share/cmake-3.25/Templates/CMakeVSMacros1.vsmacros
diff --git a/deps/cmake/share/cmake-3.21/Templates/CMakeVSMacros2.vsmacros b/deps/cmake/share/cmake-3.25/Templates/CMakeVSMacros2.vsmacros
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/CMakeVSMacros2.vsmacros
rename to deps/cmake/share/cmake-3.25/Templates/CMakeVSMacros2.vsmacros
diff --git a/deps/cmake/share/cmake-3.21/Templates/CPack.GenericDescription.txt b/deps/cmake/share/cmake-3.25/Templates/CPack.GenericDescription.txt
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/CPack.GenericDescription.txt
rename to deps/cmake/share/cmake-3.25/Templates/CPack.GenericDescription.txt
diff --git a/deps/cmake/share/cmake-3.21/Templates/CPack.GenericLicense.txt b/deps/cmake/share/cmake-3.25/Templates/CPack.GenericLicense.txt
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/CPack.GenericLicense.txt
rename to deps/cmake/share/cmake-3.25/Templates/CPack.GenericLicense.txt
diff --git a/deps/cmake/share/cmake-3.21/Templates/CPack.GenericWelcome.txt b/deps/cmake/share/cmake-3.25/Templates/CPack.GenericWelcome.txt
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/CPack.GenericWelcome.txt
rename to deps/cmake/share/cmake-3.25/Templates/CPack.GenericWelcome.txt
diff --git a/deps/cmake/share/cmake-3.21/Templates/CPackConfig.cmake.in b/deps/cmake/share/cmake-3.25/Templates/CPackConfig.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/CPackConfig.cmake.in
rename to deps/cmake/share/cmake-3.25/Templates/CPackConfig.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Templates/CTestScript.cmake.in b/deps/cmake/share/cmake-3.25/Templates/CTestScript.cmake.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/CTestScript.cmake.in
rename to deps/cmake/share/cmake-3.25/Templates/CTestScript.cmake.in
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/CustomBuildDepFile.targets b/deps/cmake/share/cmake-3.25/Templates/MSBuild/CustomBuildDepFile.targets
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/CustomBuildDepFile.targets
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/CustomBuildDepFile.targets
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CL.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CL.json
similarity index 98%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CL.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CL.json
index 06158bee..a8c2cc7f 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CL.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CL.json
@@ -860,6 +860,17 @@
     "value": "",
     "flags": [
       "UserValue",
+      "UserRequired",
+      "SemicolonAppendable"
+    ]
+  },
+  {
+    "name": "ForcedIncludeFiles",
+    "switch": "FI",
+    "comment": "Forced Include File",
+    "value": "",
+    "flags": [
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CSharp.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CSharp.json
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CSharp.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CSharp.json
index 9f21d9a2..526bcdae 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CSharp.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CSharp.json
@@ -200,6 +200,13 @@
     "value": "pdbonly",
     "flags": []
   },
+  {
+    "name":  "DebugType",
+    "switch": "debug:embedded",
+    "comment": "",
+    "value": "embedded",
+    "flags": []
+  },
   {
     "name":  "Optimize",
     "switch": "optimize",
@@ -470,21 +477,21 @@
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib",
     "comment": "",
     "value": "true",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib-",
     "comment": "",
     "value": "false",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib+",
     "comment": "",
     "value": "true",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_Cuda.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_Cuda.json
similarity index 56%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_Cuda.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_Cuda.json
index b3230aca..b0765f58 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_Cuda.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_Cuda.json
@@ -69,118 +69,6 @@
       "UserFollowing"
     ]
   },
-  {
-    "name":  "cmake-temp-gencode",
-    "switch": "gencode=",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserValue",
-      "SemicolonAppendable"
-    ]
-  },
-  {
-    "name":  "cmake-temp-gencode",
-    "switch": "gencode",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserFollowing",
-      "SemicolonAppendable"
-    ]
-  },
-  {
-    "name":  "cmake-temp-gencode",
-    "switch": "-generate-code=",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserValue",
-      "SemicolonAppendable"
-    ]
-  },
-  {
-    "name":  "cmake-temp-gencode",
-    "switch": "-generate-code",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserFollowing",
-      "SemicolonAppendable"
-    ]
-  },
-  {
-    "name":  "cmake-temp-code",
-    "switch": "code=",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
-  {
-    "name":  "cmake-temp-code",
-    "switch": "code",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserFollowing"
-    ]
-  },
-  {
-    "name":  "cmake-temp-code",
-    "switch": "-gpu-code=",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
-  {
-    "name":  "cmake-temp-code",
-    "switch": "-gpu-code",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserFollowing"
-    ]
-  },
-  {
-    "name":  "cmake-temp-arch",
-    "switch": "arch=",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
-  {
-    "name":  "cmake-temp-arch",
-    "switch": "arch",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserFollowing"
-    ]
-  },
-  {
-    "name":  "cmake-temp-arch",
-    "switch": "-gpu-architecture=",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserValue"
-    ]
-  },
-  {
-    "name":  "cmake-temp-arch",
-    "switch": "-gpu-architecture",
-    "comment": "",
-    "value": "",
-    "flags": [
-      "UserFollowing"
-    ]
-  },
   {
     "name":  "FastMath",
     "switch": "use_fast_math",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CudaHost.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CudaHost.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_CudaHost.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_CudaHost.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_LIB.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_LIB.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_LIB.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_LIB.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_Link.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_Link.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_Link.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_Link.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_MASM.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_MASM.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_MASM.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_MASM.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_NASM.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_NASM.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_NASM.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_NASM.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_RC.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_RC.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v10_RC.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v10_RC.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_CL.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_CL.json
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_CL.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_CL.json
index b47ab2e9..bb64985f 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_CL.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_CL.json
@@ -923,6 +923,17 @@
     "value": "",
     "flags": [
       "UserValue",
+      "UserRequired",
+      "SemicolonAppendable"
+    ]
+  },
+  {
+    "name": "ForcedIncludeFiles",
+    "switch": "FI",
+    "comment": "Forced Include File",
+    "value": "",
+    "flags": [
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_CSharp.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_CSharp.json
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_CSharp.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_CSharp.json
index 9f21d9a2..526bcdae 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_CSharp.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_CSharp.json
@@ -200,6 +200,13 @@
     "value": "pdbonly",
     "flags": []
   },
+  {
+    "name":  "DebugType",
+    "switch": "debug:embedded",
+    "comment": "",
+    "value": "embedded",
+    "flags": []
+  },
   {
     "name":  "Optimize",
     "switch": "optimize",
@@ -470,21 +477,21 @@
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib",
     "comment": "",
     "value": "true",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib-",
     "comment": "",
     "value": "false",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib+",
     "comment": "",
     "value": "true",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_LIB.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_LIB.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_LIB.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_LIB.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_Link.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_Link.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_Link.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_Link.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_MASM.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_MASM.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_MASM.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_MASM.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_RC.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_RC.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v11_RC.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v11_RC.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_CL.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_CL.json
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_CL.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_CL.json
index 771a5551..5bc61fd8 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_CL.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_CL.json
@@ -937,6 +937,17 @@
     "value": "",
     "flags": [
       "UserValue",
+      "UserRequired",
+      "SemicolonAppendable"
+    ]
+  },
+  {
+    "name": "ForcedIncludeFiles",
+    "switch": "FI",
+    "comment": "Forced Include File",
+    "value": "",
+    "flags": [
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_CSharp.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_CSharp.json
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_CSharp.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_CSharp.json
index 9f21d9a2..526bcdae 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_CSharp.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_CSharp.json
@@ -200,6 +200,13 @@
     "value": "pdbonly",
     "flags": []
   },
+  {
+    "name":  "DebugType",
+    "switch": "debug:embedded",
+    "comment": "",
+    "value": "embedded",
+    "flags": []
+  },
   {
     "name":  "Optimize",
     "switch": "optimize",
@@ -470,21 +477,21 @@
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib",
     "comment": "",
     "value": "true",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib-",
     "comment": "",
     "value": "false",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib+",
     "comment": "",
     "value": "true",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_LIB.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_LIB.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_LIB.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_LIB.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_Link.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_Link.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_Link.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_Link.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_MASM.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_MASM.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_MASM.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_MASM.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_RC.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_RC.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v12_RC.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v12_RC.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_CL.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_CL.json
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_CL.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_CL.json
index 3dc9f353..58e22ba4 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_CL.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_CL.json
@@ -972,6 +972,17 @@
     "value": "",
     "flags": [
       "UserValue",
+      "UserRequired",
+      "SemicolonAppendable"
+    ]
+  },
+  {
+    "name": "ForcedIncludeFiles",
+    "switch": "FI",
+    "comment": "Forced Include File",
+    "value": "",
+    "flags": [
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_CSharp.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_CSharp.json
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_CSharp.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_CSharp.json
index 9f21d9a2..526bcdae 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_CSharp.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_CSharp.json
@@ -200,6 +200,13 @@
     "value": "pdbonly",
     "flags": []
   },
+  {
+    "name":  "DebugType",
+    "switch": "debug:embedded",
+    "comment": "",
+    "value": "embedded",
+    "flags": []
+  },
   {
     "name":  "Optimize",
     "switch": "optimize",
@@ -470,21 +477,21 @@
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib",
     "comment": "",
     "value": "true",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib-",
     "comment": "",
     "value": "false",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib+",
     "comment": "",
     "value": "true",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_Link.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_Link.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v140_Link.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v140_Link.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_CL.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_CL.json
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_CL.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_CL.json
index 5b18e32e..604e6b6c 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_CL.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_CL.json
@@ -1077,6 +1077,17 @@
     "value": "",
     "flags": [
       "UserValue",
+      "UserRequired",
+      "SemicolonAppendable"
+    ]
+  },
+  {
+    "name": "ForcedIncludeFiles",
+    "switch": "FI",
+    "comment": "Forced Include File",
+    "value": "",
+    "flags": [
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_CSharp.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_CSharp.json
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_CSharp.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_CSharp.json
index 9f21d9a2..526bcdae 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_CSharp.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_CSharp.json
@@ -200,6 +200,13 @@
     "value": "pdbonly",
     "flags": []
   },
+  {
+    "name":  "DebugType",
+    "switch": "debug:embedded",
+    "comment": "",
+    "value": "embedded",
+    "flags": []
+  },
   {
     "name":  "Optimize",
     "switch": "optimize",
@@ -470,21 +477,21 @@
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib",
     "comment": "",
     "value": "true",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib-",
     "comment": "",
     "value": "false",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib+",
     "comment": "",
     "value": "true",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_Link.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_Link.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v141_Link.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v141_Link.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_CL.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_CL.json
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_CL.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_CL.json
index 64eeac4a..c76c040b 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_CL.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_CL.json
@@ -1214,7 +1214,7 @@
     "comment": "Additional Module Dependencies",
     "value": "",
     "flags": [
-      "UserValue",
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
@@ -1224,7 +1224,7 @@
     "comment": "Additional Header Unit Dependencies",
     "value": "",
     "flags": [
-      "UserValue",
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
@@ -1286,6 +1286,17 @@
     "value": "",
     "flags": [
       "UserValue",
+      "UserRequired",
+      "SemicolonAppendable"
+    ]
+  },
+  {
+    "name": "ForcedIncludeFiles",
+    "switch": "FI",
+    "comment": "Forced Include File",
+    "value": "",
+    "flags": [
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_CSharp.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_CSharp.json
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_CSharp.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_CSharp.json
index ae1bd47b..d57a97e1 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_CSharp.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_CSharp.json
@@ -207,6 +207,13 @@
     "value": "portable",
     "flags": []
   },
+  {
+    "name":  "DebugType",
+    "switch": "debug:embedded",
+    "comment": "",
+    "value": "embedded",
+    "flags": []
+  },
   {
     "name":  "Optimize",
     "switch": "optimize",
@@ -488,21 +495,21 @@
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib",
     "comment": "",
     "value": "true",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib-",
     "comment": "",
     "value": "false",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib+",
     "comment": "",
     "value": "true",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_Link.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_Link.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v142_Link.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v142_Link.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_CL.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_CL.json
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_CL.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_CL.json
index 8b700aaf..993fbf14 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_CL.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_CL.json
@@ -1214,7 +1214,7 @@
     "comment": "Additional Module Dependencies",
     "value": "",
     "flags": [
-      "UserValue",
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
@@ -1224,7 +1224,7 @@
     "comment": "Additional Header Unit Dependencies",
     "value": "",
     "flags": [
-      "UserValue",
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
@@ -1285,6 +1285,17 @@
     "value": "",
     "flags": [
       "UserValue",
+      "UserRequired",
+      "SemicolonAppendable"
+    ]
+  },
+  {
+    "name": "ForcedIncludeFiles",
+    "switch": "FI",
+    "comment": "Forced Include File",
+    "value": "",
+    "flags": [
+      "UserFollowing",
       "SemicolonAppendable"
     ]
   },
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_CSharp.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_CSharp.json
similarity index 97%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_CSharp.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_CSharp.json
index ae1bd47b..d57a97e1 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_CSharp.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_CSharp.json
@@ -207,6 +207,13 @@
     "value": "portable",
     "flags": []
   },
+  {
+    "name":  "DebugType",
+    "switch": "debug:embedded",
+    "comment": "",
+    "value": "embedded",
+    "flags": []
+  },
   {
     "name":  "Optimize",
     "switch": "optimize",
@@ -488,21 +495,21 @@
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib",
     "comment": "",
     "value": "true",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib-",
     "comment": "",
     "value": "false",
     "flags": []
   },
   {
-    "name":  "NoStandardLib",
+    "name":  "NoStdLib",
     "switch": "nostdlib+",
     "comment": "",
     "value": "true",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_Link.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_Link.json
similarity index 99%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_Link.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_Link.json
index 71d58f88..4422f55b 100644
--- a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v143_Link.json
+++ b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v143_Link.json
@@ -977,13 +977,6 @@
     "value": "true",
     "flags": []
   },
-  {
-    "name": "LinkControlFlowGuard",
-    "switch": "guard:cf",
-    "comment": "Control Flow Guard",
-    "value": "true",
-    "flags": []
-  },
   {
     "name": "LinkGuardEHContMetadata",
     "switch": "guard:ehcont",
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v14_LIB.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v14_LIB.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v14_LIB.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v14_LIB.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v14_MASM.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v14_MASM.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v14_MASM.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v14_MASM.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v14_RC.json b/deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v14_RC.json
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/FlagTables/v14_RC.json
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/FlagTables/v14_RC.json
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/nasm.props.in b/deps/cmake/share/cmake-3.25/Templates/MSBuild/nasm.props.in
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/nasm.props.in
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/nasm.props.in
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/nasm.targets b/deps/cmake/share/cmake-3.25/Templates/MSBuild/nasm.targets
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/nasm.targets
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/nasm.targets
diff --git a/deps/cmake/share/cmake-3.21/Templates/MSBuild/nasm.xml b/deps/cmake/share/cmake-3.25/Templates/MSBuild/nasm.xml
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/MSBuild/nasm.xml
rename to deps/cmake/share/cmake-3.25/Templates/MSBuild/nasm.xml
diff --git a/deps/cmake/share/cmake-3.21/Templates/TestDriver.cxx.in b/deps/cmake/share/cmake-3.25/Templates/TestDriver.cxx.in
similarity index 96%
rename from deps/cmake/share/cmake-3.21/Templates/TestDriver.cxx.in
rename to deps/cmake/share/cmake-3.25/Templates/TestDriver.cxx.in
index 6ced8001..c47266a7 100644
--- a/deps/cmake/share/cmake-3.21/Templates/TestDriver.cxx.in
+++ b/deps/cmake/share/cmake-3.25/Templates/TestDriver.cxx.in
@@ -63,7 +63,7 @@ static char* lowercase(const char* string)
   return new_string;
 }
 
-int isTestSkipped(const char *name, int n_skipped_tests, char *skipped_tests[]) {
+static int isTestSkipped(const char *name, int n_skipped_tests, char *skipped_tests[]) {
   int i;
   for (i = 0; i < n_skipped_tests; i++) {
     if (strcmp(name, skipped_tests[i]) == 0) {
@@ -138,7 +138,7 @@ int main(int ac, char* av[])
       t = clock() - t;
       status_message = (status == -1) ? "not ok" : "ok";
       {
-        double time_taken = ((double)t) / CLOCKS_PER_SEC;
+        double time_taken = CM_CAST(double, t) / CLOCKS_PER_SEC;
         printf("%s %d %s # %f\n", status_message, i + 1, name, time_taken);
       }
     }
diff --git a/deps/cmake/share/cmake-3.21/Templates/Windows/ApplicationIcon.png b/deps/cmake/share/cmake-3.25/Templates/Windows/ApplicationIcon.png
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/Windows/ApplicationIcon.png
rename to deps/cmake/share/cmake-3.25/Templates/Windows/ApplicationIcon.png
diff --git a/deps/cmake/share/cmake-3.21/Templates/Windows/Logo.png b/deps/cmake/share/cmake-3.25/Templates/Windows/Logo.png
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/Windows/Logo.png
rename to deps/cmake/share/cmake-3.25/Templates/Windows/Logo.png
diff --git a/deps/cmake/share/cmake-3.21/Templates/Windows/SmallLogo.png b/deps/cmake/share/cmake-3.25/Templates/Windows/SmallLogo.png
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/Windows/SmallLogo.png
rename to deps/cmake/share/cmake-3.25/Templates/Windows/SmallLogo.png
diff --git a/deps/cmake/share/cmake-3.21/Templates/Windows/SmallLogo44x44.png b/deps/cmake/share/cmake-3.25/Templates/Windows/SmallLogo44x44.png
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/Windows/SmallLogo44x44.png
rename to deps/cmake/share/cmake-3.25/Templates/Windows/SmallLogo44x44.png
diff --git a/deps/cmake/share/cmake-3.21/Templates/Windows/SplashScreen.png b/deps/cmake/share/cmake-3.25/Templates/Windows/SplashScreen.png
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/Windows/SplashScreen.png
rename to deps/cmake/share/cmake-3.25/Templates/Windows/SplashScreen.png
diff --git a/deps/cmake/share/cmake-3.21/Templates/Windows/StoreLogo.png b/deps/cmake/share/cmake-3.25/Templates/Windows/StoreLogo.png
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/Windows/StoreLogo.png
rename to deps/cmake/share/cmake-3.25/Templates/Windows/StoreLogo.png
diff --git a/deps/cmake/share/cmake-3.21/Templates/Windows/Windows_TemporaryKey.pfx b/deps/cmake/share/cmake-3.25/Templates/Windows/Windows_TemporaryKey.pfx
similarity index 100%
rename from deps/cmake/share/cmake-3.21/Templates/Windows/Windows_TemporaryKey.pfx
rename to deps/cmake/share/cmake-3.25/Templates/Windows/Windows_TemporaryKey.pfx
diff --git a/deps/cmake/share/cmake-3.21/include/cmCPluginAPI.h b/deps/cmake/share/cmake-3.25/include/cmCPluginAPI.h
similarity index 100%
rename from deps/cmake/share/cmake-3.21/include/cmCPluginAPI.h
rename to deps/cmake/share/cmake-3.25/include/cmCPluginAPI.h