cmake: rename Windows detection cache file

To flatten the directory tree.

Closes #15859

diff --git a/.github/labeler.yml b/.github/labeler.yml
index 43d391ed230edff41f813d03a9fdd83d1feacc5c..59ca1565e31bdacc89694c2b59d398dada5e9a28 100644 (file)
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -516,7 +516,7 @@ Windows:
           - any-glob-to-all-files: "{\
               appveyor.*,\
               .github/workflows/windows.yml,\
-              CMake/Platforms/WindowsCache.cmake,\
+              CMake/win32-cache.cmake,\
               lib/*win32*,\
               lib/curl_multibyte.*,\
               lib/rename.*,\

diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/win32-cache.cmake
similarity index 100%
rename from CMake/Platforms/WindowsCache.cmake
rename to CMake/win32-cache.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45aea19456b74946e0733ee6b1a629d2790c521d..0721ff243362e84200e4bafce24314dee40ee176 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -525,9 +525,9 @@ include(CheckSymbolExists)
 include(CheckTypeSize)
 include(CheckCSourceCompiles)
 
-# Preload settings on Windows
 if(WIN32)
-  include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/Platforms/WindowsCache.cmake")
+  # Preload settings on Windows
+  include("${CMAKE_CURRENT_SOURCE_DIR}/CMake/win32-cache.cmake")
 elseif(APPLE)
   # Fast-track predictable feature detections
   set(HAVE_EVENTFD 0)

diff --git a/Makefile.am b/Makefile.am
index 1f18c252e66afdd3f0b6bf2bbd2c5774813f2a1b..20405122d43d4c23067b6ec70aef8ad465264452 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,8 +59,8 @@ CMAKE_DIST =                                    \
  CMake/Macros.cmake                             \
  CMake/OtherTests.cmake                         \
  CMake/PickyWarnings.cmake                      \
- CMake/Platforms/WindowsCache.cmake             \
  CMake/Utilities.cmake                          \
+ CMake/win32-cache.cmake                        \
  CMakeLists.txt
 
 VC_DIST = projects/README.md                           \