From: Viktor Szakats <commit@vsz.me>
Date: Fri, 17 Jan 2025 22:40:09 +0000 (+0100)
Subject: cmake: do not store `MINGW64_VERSION` in cache
X-Git-Tag: curl-8_12_0~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38e7302ae4a0a301e1a6138b682d8d5f8cf936e1;p=thirdparty%2Fcurl.git

cmake: do not store `MINGW64_VERSION` in cache

Follow-up to e49797abc24b8e0ac652d7aa0ceec7d252f9a019 #16022
Closes #16040
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7b1fe5e3d..ce22cba5af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,16 +225,17 @@ if(WIN32)
     string(TOLOWER "${CURL_TEST_OUTPUT}" HAVE_WIN32_WINNT)
     message(STATUS "Found _WIN32_WINNT=${HAVE_WIN32_WINNT}")
   endif()
-  # Avoid storing HAVE_WIN32_WINNT in CMake cache
-  unset(HAVE_WIN32_WINNT CACHE)
+  unset(HAVE_WIN32_WINNT CACHE)  # Avoid storing in CMake cache
 
   if(MINGW)
+    # Detect __MINGW64_VERSION_MAJOR, __MINGW64_VERSION_MINOR and store as MINGW64_VERSION
     curl_internal_test(MINGW64_VERSION)
     if(MINGW64_VERSION)
       string(REGEX MATCH "MINGW64_VERSION=[0-9]+\.[0-9]+" CURL_TEST_OUTPUT "${CURL_TEST_OUTPUT}")
       string(REGEX REPLACE "MINGW64_VERSION=" "" MINGW64_VERSION "${CURL_TEST_OUTPUT}")
       message(STATUS "Found MINGW64_VERSION=${MINGW64_VERSION}")
     endif()
+    unset(MINGW64_VERSION CACHE)  # Avoid storing in CMake cache
   endif()
 elseif(DOS OR AMIGA)
   set(BUILD_SHARED_LIBS OFF)