From dea00a6d7386b91dfcf9b87eb5b2d5c24186aea9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Thu, 13 Aug 2026 01:01:07 +0200
Subject: [PATCH] cmake: use built-in variable and target property dump
 functions with CMake 4.5+

Their output is nearly identical to curl's implementations. Minor
differences: it goes to stdout (curl: stderr), marks cache variables,
but doesn't mark 'advanced' ones.

Also:
- indent curl's output to match CMake's.
- replace single quotes with double to match CMake output.
- alpha-sort target properties to match CMake.
- alpha-sort config types to match CMake.
- tested OK with cmake-4.4.20260811-g567ed0e and 4.4.20260812-g760e4fb.

Refs:
https://gitlab.kitware.com/cmake/cmake/-/commit/f723293c7f625b14bd48627042fc04e67b76c513
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11834
https://gitlab.kitware.com/cmake/cmake/-/work_items/27513
https://cmake.org/cmake/help/git-master/command/cmake_language.html#command:cmake_language

Follow-up to 855acb3bb07e0dd06b5722218eb5fded333f7ce0 #17701
Follow-up to f58342ae21fe4a04edddd98f255d8b0c3d66ae3a #15562
Follow-up to cd51bb503ae1779a45c90898b89da6e19c616521 #14439

Closes #22566
---
 CMake/Utilities.cmake | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/CMake/Utilities.cmake b/CMake/Utilities.cmake
index f86a6aa1e8..319160b0a5 100644
--- a/CMake/Utilities.cmake
+++ b/CMake/Utilities.cmake
@@ -37,24 +37,30 @@ endfunction()
 # Dump all defined variables with their values
 function(curl_dumpvars)
   message("::group::CMake Variable Dump")
-  get_cmake_property(_vars VARIABLES)
-  foreach(_var IN ITEMS ${_vars})
-    get_property(_var_type CACHE ${_var} PROPERTY TYPE)
-    get_property(_var_advanced CACHE ${_var} PROPERTY ADVANCED)
-    if(_var_type)
-      set(_var_type ":${_var_type}")
-    endif()
-    if(_var_advanced)
-      set(_var_advanced " [adv]")
-    endif()
-    message("${_var}${_var_type}${_var_advanced} = '${${_var}}'")
-  endforeach()
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.5)
+    cmake_language(PRINT_VARIABLES ALL)
+  else()
+    get_cmake_property(_vars VARIABLES)
+    foreach(_var IN ITEMS ${_vars})
+      get_property(_var_type CACHE ${_var} PROPERTY TYPE)
+      get_property(_var_advanced CACHE ${_var} PROPERTY ADVANCED)
+      if(_var_type)
+        set(_var_type ":${_var_type}")
+      endif()
+      if(_var_advanced)
+        set(_var_advanced " [adv]")
+      endif()
+      message("   ${_var}${_var_type}${_var_advanced} = \"${${_var}}\"")
+    endforeach()
+  endif()
   message("::endgroup::")
 endfunction()
 
 # Dump all target properties
 function(curl_dumptargetprops _target)
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.19 AND TARGET "${_target}")
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.5)
+    cmake_language(PRINT_PROPERTIES TARGETS "${_target}" ALL)
+  elseif(CMAKE_VERSION VERSION_GREATER_EQUAL 3.19 AND TARGET "${_target}")
     execute_process(COMMAND "${CMAKE_COMMAND}" "--help-property-list" OUTPUT_VARIABLE _cmake_property_list)
     string(REPLACE "\n" ";" _cmake_property_list "${_cmake_property_list}")
     list(REMOVE_DUPLICATES _cmake_property_list)
@@ -64,21 +70,22 @@ function(curl_dumptargetprops _target)
     if(NOT _target_imported)
       list(REMOVE_ITEM _cmake_property_list "LOCATION" "LOCATION_<CONFIG>" "MACOSX_PACKAGE_LOCATION" "VS_DEPLOYMENT_LOCATION")
     endif()
+    list(SORT _cmake_property_list)
     foreach(_prop IN LISTS _cmake_property_list)
       if(_prop MATCHES "<CONFIG>")
-        foreach(_config IN ITEMS "DEBUG" "RELEASE" "MINSIZEREL" "RELWITHDEBINFO")
+        foreach(_config IN ITEMS "DEBUG" "MINSIZEREL" "RELEASE" "RELWITHDEBINFO")
           string(REPLACE "<CONFIG>" "${_config}" _propconfig "${_prop}")
           get_property(_is_set TARGET "${_target}" PROPERTY "${_propconfig}" SET)
           if(_is_set)
             get_target_property(_val "${_target}" "${_propconfig}")
-            message("${_target}.${_propconfig} = '${_val}'")
+            message("   ${_target}.${_propconfig} = \"${_val}\"")
           endif()
         endforeach()
       else()
         get_property(_is_set TARGET "${_target}" PROPERTY "${_prop}" SET)
         if(_is_set)
           get_target_property(_val "${_target}" "${_prop}")
-          message("${_target}.${_prop} = '${_val}'")
+          message("   ${_target}.${_prop} = \"${_val}\"")
         endif()
       endif()
     endforeach()