Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New upstream version 3.29.6

Browse Source
This commit is contained in:
Timo Röhling 2024-06-20 15:39:04 +02:00
parent b271e96a3c
commit 46ee502450
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Help/release/3.29.rst
View File

@ -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 3.29.5 reverts the default for compatibility. Projects may transition
to ``perMachine`` on their own schedule by setting to ``perMachine`` on their own schedule by setting
``CPACK_WIX_INSTALL_SCOPE``. ``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.

2
Modules/Compiler/Clang.cmake
View File

@ -121,7 +121,7 @@ else()
# -fansi-escape-codes mentioned at https://releases.llvm.org/3.7.0/tools/clang/docs/UsersManual.html # -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) 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 -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() else()
set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS -fcolor-diagnostics) set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS -fcolor-diagnostics)
set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-color-diagnostics) set(CMAKE_${lang}_COMPILE_OPTIONS_COLOR_DIAGNOSTICS_OFF -fno-color-diagnostics)

4
Source/CMakeVersion.cmake
View File

@ -1,7 +1,7 @@
# CMake version number components. # CMake version number components.
set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 29) set(CMake_VERSION_MINOR 29)
set(CMake_VERSION_PATCH 5) set(CMake_VERSION_PATCH 6)
#set(CMake_VERSION_RC 0) #set(CMake_VERSION_RC 0)
set(CMake_VERSION_IS_DIRTY 0) set(CMake_VERSION_IS_DIRTY 0)
@ -21,7 +21,7 @@ endif()
if(NOT CMake_VERSION_NO_GIT) if(NOT CMake_VERSION_NO_GIT)
# If this source was exported by 'git archive', use its commit info. # 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. # 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]* " 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]* "

10
Source/cmOutputConverter.cxx
View File

@ -450,7 +450,8 @@ bool cmOutputConverter::Shell_CharNeedsQuotes(char c, int flags)
} }
} else { } else {
/* On Windows several special characters need quotes to preserve them. */ /* 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; return true;
} }
} }
@ -670,11 +671,8 @@ std::string cmOutputConverter::Shell_GetArgument(cm::string_view in, int flags)
} }
} else if (*cit == ';') { } else if (*cit == ';') {
if (flags & Shell_Flag_VSIDE) { if (flags & Shell_Flag_VSIDE) {
/* In a VS IDE a semicolon is written ";". If this is written /* In VS a semicolon is written `";"` inside a quoted argument.
in an un-quoted argument it starts a quoted segment, It ends quoting, inserts the `;`, and restarts quoting. */
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. */
out += "\";\""; out += "\";\"";
} else { } else {
/* Otherwise a semicolon is written just ;. */ /* Otherwise a semicolon is written just ;. */