summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Help/release/3.28.rst7
-rw-r--r--Help/release/3.29.rst4
-rw-r--r--Source/CMakeVersion.cmake2
-rw-r--r--Source/Checks/cm_cxx_features.cmake2
4 files changed, 12 insertions, 3 deletions
diff --git a/Help/release/3.28.rst b/Help/release/3.28.rst
index 77f03f6..b7a1435 100644
--- a/Help/release/3.28.rst
+++ b/Help/release/3.28.rst
@@ -219,3 +219,10 @@ Changes made since CMake 3.28.0 include the following.
* This version made no changes to documented features or interfaces.
Some implementation updates were made to C++ modules support.
+
+3.28.6
+------
+
+* This version made no changes to documented features or interfaces.
+ Some implementation updates were made to support ecosystem changes
+ and/or fix regressions.
diff --git a/Help/release/3.29.rst b/Help/release/3.29.rst
index 35f6d39..3903c91 100644
--- a/Help/release/3.29.rst
+++ b/Help/release/3.29.rst
@@ -212,8 +212,8 @@ Changes made since CMake 3.29.0 include the following.
:prop_tgt:`LINKER_TYPE` target property now work with compilers
for the ``Swift`` language.
-3.29.2, 3.29.3
---------------
+3.29.2, 3.29.3, 3.29.4
+----------------------
* These versions made no changes to documented features or interfaces.
Some implementation updates were made to support ecosystem changes
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 58a33eb..f9df02e 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 29)
-set(CMake_VERSION_PATCH 20240603)
+set(CMake_VERSION_PATCH 20240604)
#set(CMake_VERSION_RC 0)
set(CMake_VERSION_IS_DIRTY 0)
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index 019b867..0a03f3a 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -59,6 +59,8 @@ function(cm_check_cxx_feature name)
string(REGEX REPLACE "[^\n]*icpx: warning: overriding [^\n]*" "" check_output "${check_output}")
# Filter out ld warnings.
string(REGEX REPLACE "[^\n]*ld: warning: [^\n]*" "" check_output "${check_output}")
+ # Filter out distcc.
+ string(REGEX REPLACE "[^\n]*distcc\\[[0-9]+\\][^\n]*[Ww]arning:[^\n]*" "" check_output "${check_output}")
# If using the feature causes warnings, treat it as broken/unavailable.
if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]")
set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)