From 46ee50245011f29beccfebf571eab5307903265a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20R=C3=B6hling?= <roehling@debian.org>
Date: Thu, 20 Jun 2024 15:39:04 +0200
Subject: [PATCH] New upstream version 3.29.6

---
 Help/release/3.29.rst        |  7 +++++++
 Modules/Compiler/Clang.cmake |  2 +-
 Source/CMakeVersion.cmake    |  4 ++--
 Source/cmOutputConverter.cxx | 10 ++++------
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Help/release/3.29.rst b/Help/release/3.29.rst
index 10912b24d..950616e91 100644
--- a/Help/release/3.29.rst
+++ b/Help/release/3.29.rst
@@ -230,3 +230,10 @@ Changes made since CMake 3.29.0 include the following.
   3.29.5 reverts the default for compatibility.  Projects may transition
   to ``perMachine`` on their own schedule by setting
   ``CPACK_WIX_INSTALL_SCOPE``.
+
+3.29.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/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake
index 2452d5ee4..e136e370a 100644
--- a/Modules/Compiler/Clang.cmake
+++ b/Modules/Compiler/Clang.cmake
@@ -121,7 +121,7 @@ else()
       # -fansi-escape-codes mentioned at https://releases.llvm.org/3.7.0/tools/clang/docs/UsersManual.html
       if (CMAKE_HOST_WIN32 AND CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 3.7)
         set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS -fansi-escape-codes -fcolor-diagnostics)
-        set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-ansi-escape-codes  -fno-color-diagnostics)
+        set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-color-diagnostics)
       else()
         set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS -fcolor-diagnostics)
         set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-color-diagnostics)
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 90e2e0dcb..674e92c6e 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 5)
+set(CMake_VERSION_PATCH 6)
 #set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 
@@ -21,7 +21,7 @@ endif()
 
 if(NOT CMake_VERSION_NO_GIT)
   # If this source was exported by 'git archive', use its commit info.
-  set(git_info [==[facfba088f CMake 3.29.5]==])
+  set(git_info [==[cdc901797a CMake 3.29.6]==])
 
   # Otherwise, try to identify the current development source version.
   if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* "
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index f4a8d0cfa..9aac27300 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -450,7 +450,8 @@ bool cmOutputConverter::Shell_CharNeedsQuotes(char c, int flags)
     }
   } else {
     /* On Windows several special characters need quotes to preserve them.  */
-    if (Shell_CharNeedsQuotesOnWindows(c)) {
+    if (Shell_CharNeedsQuotesOnWindows(c) ||
+        (c == ';' && (flags & Shell_Flag_VSIDE))) {
       return true;
     }
   }
@@ -670,11 +671,8 @@ std::string cmOutputConverter::Shell_GetArgument(cm::string_view in, int flags)
       }
     } else if (*cit == ';') {
       if (flags & Shell_Flag_VSIDE) {
-        /* In a VS IDE a semicolon is written ";".  If this is written
-           in an un-quoted argument it starts a quoted segment,
-           inserts the ; and ends the segment.  If it is written in a
-           quoted argument it ends quoting, inserts the ; and restarts
-           quoting.  Either way the ; is isolated.  */
+        /* In VS a semicolon is written `";"` inside a quoted argument.
+           It ends quoting, inserts the `;`, and restarts quoting.  */
         out += "\";\"";
       } else {
         /* Otherwise a semicolon is written just ;. */