summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Help/manual/cmake-generator-expressions.7.rst2
-rw-r--r--Help/release/3.24.rst48
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake2
-rw-r--r--Modules/CompilerId/Xcode-3.pbxproj.in3
-rw-r--r--Source/cmWindowsRegistry.h1
-rw-r--r--Tests/RunCMake/RunCMake.cmake2
6 files changed, 33 insertions, 25 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 73356d9..c871b1b 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -1449,7 +1449,7 @@ Output-Related Expressions
.. versionadded:: 3.24
Manage the grouping of libraries during the link step.
- This expression may be used to specify how to kept groups of libraries during
+ This expression may be used to specify how to keep groups of libraries during
the link of a target.
For example:
diff --git a/Help/release/3.24.rst b/Help/release/3.24.rst
index 4bde23f..d0db764 100644
--- a/Help/release/3.24.rst
+++ b/Help/release/3.24.rst
@@ -28,14 +28,16 @@ Generators
* The :generator:`Green Hills MULTI` generator now generates build
rules to re-run CMake if any CMake files are updated.
-* The :ref:`Visual Studio Generators` now support ``SYSTEM`` headers.
+* The :ref:`Visual Studio Generators` now support ``SYSTEM`` headers
+ when using VS 2019 Update 11 or later.
Command-Line
------------
* :manual:`cmake(1)` gained the ``--fresh`` command-line option to remove
- any existing ``CMakeCache.txt`` when configuring a build tree, thus
- starting a new configuration as if the build tree were freshly created.
+ any existing ``CMakeCache.txt`` file and associated ``CMakeFiles/``
+ directory, when configuring a build tree, thus starting a new configuration
+ as if the build tree were freshly created.
* :manual:`cmake(1)` gained the ``--compile-no-warning-as-error`` command-line
option which causes the effects of the :prop_tgt:`COMPILE_WARNING_AS_ERROR`
@@ -93,14 +95,14 @@ Commands
``RANGE_END`` to specify a range of bytes to download. This can be
useful for downloading parts of big binary files.
-* The :command:`find_file`, :command:`find_library`, :command:`find_path`,
- :command:`find_package`, and :command:`find_program` commands have gained
- the ``NO_CMAKE_INSTALL_PREFIX`` option to control searching
+* The :command:`find_file`, :command:`find_path`, :command:`find_library`,
+ :command:`find_program`, and :command:`find_package` commands gained the
+ ``NO_CMAKE_INSTALL_PREFIX`` option to control searching
:variable:`CMAKE_INSTALL_PREFIX`.
* The :command:`find_file`, :command:`find_path`, :command:`find_library`,
:command:`find_program`, and :command:`find_package` commands gained the
- capability to specify which Windows Registry views must be queried.
+ ability to specify which Windows Registry views must be queried.
* The :command:`find_package` command gained a ``GLOBAL`` option that
allows for the promotion of imported targets to global scope for the
@@ -117,7 +119,7 @@ Variables
color build system messages with :ref:`Makefile Generators`, replacing
:variable:`CMAKE_COLOR_MAKEFILE`.
- The :envvar:`CMAKE_COLOR_DIAGNOSTICS` environment was added to set
+ The :envvar:`CMAKE_COLOR_DIAGNOSTICS` environment variable was added to set
a default value for :variable:`CMAKE_COLOR_DIAGNOSTICS`.
* The :variable:`CMAKE_COMPILE_WARNING_AS_ERROR` variable and corresponding
@@ -230,9 +232,9 @@ Generator Expressions
* The :genex:`LINK_LIBRARY` generator expression was added to manage how
libraries are specified during the link step.
- The variables :variable:`CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>` and
- :variable:`CMAKE_LINK_LIBRARY_USING_<FEATURE>` are used to define features
- usable by the :genex:`LINK_LIBRARY` generator expression.
+ The :variable:`CMAKE_<LANG>_LINK_LIBRARY_USING_<FEATURE>` and
+ :variable:`CMAKE_LINK_LIBRARY_USING_<FEATURE>` variables are used to define
+ features usable by the :genex:`LINK_LIBRARY` generator expression.
Moreover, the :prop_tgt:`LINK_LIBRARY_OVERRIDE` and
:prop_tgt:`LINK_LIBRARY_OVERRIDE_<LIBRARY>` target properties are
available to resolve incompatible features.
@@ -267,14 +269,13 @@ Generator Expressions
* ``MSYS``
* The :genex:`LINK_GROUP` generator expression was added to manage the
- grouping of libraries during the link step. The variables
+ grouping of libraries during the link step. The
:variable:`CMAKE_<LANG>_LINK_GROUP_USING_<FEATURE>` and
- :variable:`CMAKE_LINK_GROUP_USING_<FEATURE>` are used to define
- features usable by the :genex:`LINK_GROUP` generator expression.
-
- The :genex:`LINK_GROUP` generator expression can manage, on ``Linux``
- and ``BSD`` systems, circular references among static libraries
- by using the ``RESCAN`` feature.
+ :variable:`CMAKE_LINK_GROUP_USING_<FEATURE>` variables are used to define
+ features usable with the :genex:`LINK_GROUP` generator expression.
+ This release defines the ``RESCAN`` feature, which can be used to handle
+ circular references among static libraries when using toolchains for
+ Linux, BSD, SunOS and GNU toolchains for Windows.
* The :genex:`PATH` generator expression was added to manage paths.
@@ -302,7 +303,7 @@ CPack
* CPack now supports the :variable:`CPACK_THREADS` option for ``zstd``
compression when compiled with libarchive 3.6 or higher. It is
- supported by official CMake binaries available on ``cmake.org``.
+ supported by official CMake binaries available on `cmake.org`_.
Deprecated and Removed Features
===============================
@@ -314,7 +315,7 @@ Deprecated and Removed Features
* The deprecated :cpack_gen:`CPack PackageMaker Generator` has been removed.
* The :module:`FindGLUT` module no longer provides the undocumented
- result variables ``GLUT_LIBRARY`` and ``GLUT_INCLUDE_PATH``.
+ ``GLUT_LIBRARY`` and ``GLUT_INCLUDE_PATH`` result variables.
Other Changes
=============
@@ -340,7 +341,8 @@ Other Changes
* The :command:`while` command now diagnoses errors during condition
evaluation. See policy :policy:`CMP0130`.
-* The precompiled macOS binaries provided on
- `cmake.org <https://cmake.org/download/>`_ no longer attach a SLA
- to the ``.dmg`` packages. This was removed because macOS 12 deprecated
+* The precompiled macOS binaries provided on `cmake.org`_ no longer attach a
+ SLA to the ``.dmg`` packages. This was removed because macOS 12 deprecated
the tools used to attach ``.dmg`` resources.
+
+.. _`cmake.org`: https://cmake.org/download/
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 0e8b2af..2b19736 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -611,6 +611,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
endif()
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT MATCHES "^$|[Mm][Aa][Cc][Oo][Ss]")
+ set(id_code_sign_identity "-")
# When targeting macOS, use only the host architecture.
if (_CMAKE_APPLE_ARCHS_DEFAULT)
set(id_archs "ARCHS = \"${_CMAKE_APPLE_ARCHS_DEFAULT}\";")
@@ -620,6 +621,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
set(id_arch_active "ONLY_ACTIVE_ARCH = YES;")
endif()
else()
+ set(id_code_sign_identity "")
set(id_archs "")
set(id_arch_active "ONLY_ACTIVE_ARCH = YES;")
endif()
diff --git a/Modules/CompilerId/Xcode-3.pbxproj.in b/Modules/CompilerId/Xcode-3.pbxproj.in
index aab357a..43e8cc8 100644
--- a/Modules/CompilerId/Xcode-3.pbxproj.in
+++ b/Modules/CompilerId/Xcode-3.pbxproj.in
@@ -49,6 +49,7 @@
};
2C8FEB8E15DC1A1A00E56A5D = {
isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@@ -72,7 +73,7 @@
1DEB928608733DD80010E9CD = {
isa = XCBuildConfiguration;
buildSettings = {
- CODE_SIGN_IDENTITY = "";
+ CODE_SIGN_IDENTITY = "@id_code_sign_identity@";
PRODUCT_NAME = CompilerId@id_lang@;
};
name = Debug;
diff --git a/Source/cmWindowsRegistry.h b/Source/cmWindowsRegistry.h
index bb9090e..2eed297 100644
--- a/Source/cmWindowsRegistry.h
+++ b/Source/cmWindowsRegistry.h
@@ -2,6 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#pragma once
+#include <cstdint> // IWYU pragma: keep
#include <string>
#include <vector>
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index f232b1b..1c92ca0 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -165,7 +165,9 @@ function(run_cmake test)
"|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:"
"|[^\n]*xcodebuild[^\n]*DVTPlugInManager"
+ "|[^\n]*xcodebuild[^\n]*DVTSDK: Warning: SDK path collision for path"
"|[^\n]*xcodebuild[^\n]*Requested but did not find extension point with identifier"
+ "|[^\n]*xcodebuild[^\n]*nil host used in call to allows.*HTTPSCertificateForHost"
"|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type"
"|[^\n]*objc[^\n]*: Class [^\n]* One of the two will be used. Which one is undefined."
"|[^\n]*is a member of multiple groups"
generated by cgit v0.12 at 2025-01-24 07:59:26 (GMT)