From 2f0a3d43e15c2429d6d2b75d0892985b1e8302c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Wed, 30 Mar 2022 00:54:43 +0000
Subject: [PATCH 01/35] Help: Fix string(JSON ... LENGTH ...) signature

The list of indices and/or member names is optional, i.e., can be
empty. For example, string(JSON foo LENGTH "[0,0,0]") sets foo to 3.
---
 Help/command/string.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Help/command/string.rst b/Help/command/string.rst
index 9b707eb83da..b1ca2cb80dc 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -612,7 +612,7 @@ Requires an element of object type.
 .. code-block:: cmake
 
   string(JSON <out-var> [ERROR_VARIABLE <error-variable>]
-         LENGTH <json-string> <member|index> [<member|index> ...])
+         LENGTH <json-string> [<member|index> ...])
 
 Get the length of an element in ``<json-string>`` at the location
 given by the list of ``<member|index>`` arguments.

From cf4100d7da85e714df727cebd591124486a026ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Tue, 29 Mar 2022 23:49:29 +0000
Subject: [PATCH 02/35] Help: Add that CMAKE_CACHEFILE_DIR might not be defined

CMake only sets `CMAKE_CACHEFILE_DIR` when writing `CMakeCache.txt`,
so the variable will usually be undefined when `CMakeLists.txt` runs.
Revise its documentation to clarify that `CMAKE_BINARY_DIR` should
be used instead.
---
 Help/variable/CMAKE_CACHEFILE_DIR.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Help/variable/CMAKE_CACHEFILE_DIR.rst b/Help/variable/CMAKE_CACHEFILE_DIR.rst
index 8604d0e8c84..3fee09f37b3 100644
--- a/Help/variable/CMAKE_CACHEFILE_DIR.rst
+++ b/Help/variable/CMAKE_CACHEFILE_DIR.rst
@@ -1,7 +1,6 @@
 CMAKE_CACHEFILE_DIR
 -------------------
 
-The directory with the ``CMakeCache.txt`` file.
-
-This is the full path to the directory that has the ``CMakeCache.txt``
-file in it.  This is the same as :variable:`CMAKE_BINARY_DIR`.
+This variable is used internally by CMake, and may not be set during
+the first configuration of a build tree.  When it is set, it has the
+same value as :variable:`CMAKE_BINARY_DIR`.  Use that variable instead.

From 624ec3692f91788d84f9dc2b08573286bdef2cc9 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 30 Mar 2022 11:45:04 -0400
Subject: [PATCH 03/35] GNUInstallDirs: Revert "Apply Debian multiarch LIBDIR
 to more prefixes"

Revert commit dd9584b352 (GNUInstallDirs: Apply Debian multiarch LIBDIR
to more prefixes, 2021-11-19, v3.23.0-rc1~323^2).  There are separate
problems with activating multiarch `LIBDIR` for each prefix it added:

* Prefix `/` is often used to stage an installation with `DESTDIR`
  for inclusion in a tarball package or similar.

* Prefix `/usr/local` is the default `CMAKE_INSTALL_PREFIX`, causing
  the multiarch `LIBDIR` to be cached after the first configuration,
  even if the prefix changes later.

Revert the change for now, except for the documentation update.
Further discussion will be needed to select a way to enable
multiarch `LIBDIR` for `/` and `/usr/local`.

Fixes: #23365
Issue: #19698
---
 Modules/GNUInstallDirs.cmake                             | 6 ++----
 Tests/RunCMake/GNUInstallDirs/Root-Debian-stderr.txt     | 4 ++--
 Tests/RunCMake/GNUInstallDirs/UsrLocal-Debian-stderr.txt | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 4e7f87b9211..bd72901941e 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -55,7 +55,7 @@ where ``<dir>`` is one of:
   object code libraries (``lib`` or ``lib64``)
 
   On Debian, this may be ``lib/<multiarch-tuple>`` when
-  :variable:`CMAKE_INSTALL_PREFIX` is ``/``, ``/usr``, or ``/usr/local``.
+  :variable:`CMAKE_INSTALL_PREFIX` is ``/usr``.
 ``INCLUDEDIR``
   C header files (``include``)
 ``OLDINCLUDEDIR``
@@ -273,9 +273,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
 
     if(__system_type_for_install STREQUAL "debian")
       if(CMAKE_LIBRARY_ARCHITECTURE)
-        if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/"
-            OR "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$"
-            OR "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
+        if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
           set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
         endif()
         if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
diff --git a/Tests/RunCMake/GNUInstallDirs/Root-Debian-stderr.txt b/Tests/RunCMake/GNUInstallDirs/Root-Debian-stderr.txt
index 2019459d71f..25f80d3f612 100644
--- a/Tests/RunCMake/GNUInstallDirs/Root-Debian-stderr.txt
+++ b/Tests/RunCMake/GNUInstallDirs/Root-Debian-stderr.txt
@@ -4,7 +4,7 @@ CMAKE_INSTALL_DATAROOTDIR='usr/share'
 CMAKE_INSTALL_DOCDIR='usr/share/doc/Root'
 CMAKE_INSTALL_INCLUDEDIR='usr/include'
 CMAKE_INSTALL_INFODIR='usr/share/info'
-CMAKE_INSTALL_LIBDIR='usr/lib/arch'
+CMAKE_INSTALL_LIBDIR='usr/lib'
 CMAKE_INSTALL_LIBEXECDIR='usr/libexec'
 CMAKE_INSTALL_LOCALEDIR='usr/share/locale'
 CMAKE_INSTALL_LOCALSTATEDIR='var'
@@ -19,7 +19,7 @@ CMAKE_INSTALL_FULL_DATAROOTDIR='/usr/share'
 CMAKE_INSTALL_FULL_DOCDIR='/usr/share/doc/Root'
 CMAKE_INSTALL_FULL_INCLUDEDIR='/usr/include'
 CMAKE_INSTALL_FULL_INFODIR='/usr/share/info'
-CMAKE_INSTALL_FULL_LIBDIR='/usr/lib/arch'
+CMAKE_INSTALL_FULL_LIBDIR='/usr/lib'
 CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec'
 CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale'
 CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var'
diff --git a/Tests/RunCMake/GNUInstallDirs/UsrLocal-Debian-stderr.txt b/Tests/RunCMake/GNUInstallDirs/UsrLocal-Debian-stderr.txt
index 08301380e05..30795c8a955 100644
--- a/Tests/RunCMake/GNUInstallDirs/UsrLocal-Debian-stderr.txt
+++ b/Tests/RunCMake/GNUInstallDirs/UsrLocal-Debian-stderr.txt
@@ -4,7 +4,7 @@ CMAKE_INSTALL_DATAROOTDIR='share'
 CMAKE_INSTALL_DOCDIR='share/doc/UsrLocal'
 CMAKE_INSTALL_INCLUDEDIR='include'
 CMAKE_INSTALL_INFODIR='share/info'
-CMAKE_INSTALL_LIBDIR='lib/arch'
+CMAKE_INSTALL_LIBDIR='lib'
 CMAKE_INSTALL_LIBEXECDIR='libexec'
 CMAKE_INSTALL_LOCALEDIR='share/locale'
 CMAKE_INSTALL_LOCALSTATEDIR='var'
@@ -19,7 +19,7 @@ CMAKE_INSTALL_FULL_DATAROOTDIR='/usr/local/share'
 CMAKE_INSTALL_FULL_DOCDIR='/usr/local/share/doc/UsrLocal'
 CMAKE_INSTALL_FULL_INCLUDEDIR='/usr/local/include'
 CMAKE_INSTALL_FULL_INFODIR='/usr/local/share/info'
-CMAKE_INSTALL_FULL_LIBDIR='/usr/local/lib/arch'
+CMAKE_INSTALL_FULL_LIBDIR='/usr/local/lib'
 CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/local/libexec'
 CMAKE_INSTALL_FULL_LOCALEDIR='/usr/local/share/locale'
 CMAKE_INSTALL_FULL_LOCALSTATEDIR='/usr/local/var'

From f7c6b9833c55257d2b83e2cb5678139ba52df3dc Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Wed, 30 Mar 2022 15:12:25 -0400
Subject: [PATCH 04/35] CUDA: Ninja generator generates valid compile database

The ninja generator has been updated to poperly write the compile
database when the CUDA language has been enabled.

Fixes #23368
---
 Source/cmNinjaTargetGenerator.cxx      | 34 ++++++++++++++------------
 Tests/CudaOnly/WithDefs/CMakeLists.txt |  2 ++
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index dd7d2446340..e61b4b6e608 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -1678,28 +1678,32 @@ void cmNinjaTargetGenerator::ExportObjectCompileCommand(
   compileObjectVars.Includes = includes.c_str();
 
   // Rule for compiling object file.
-  std::vector<std::string> compileCmds;
+  std::string cudaCompileMode;
   if (language == "CUDA") {
-    std::string cmdVar;
     if (this->GeneratorTarget->GetPropertyAsBool(
           "CUDA_SEPARABLE_COMPILATION")) {
-      cmdVar = "CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION";
-    } else if (this->GeneratorTarget->GetPropertyAsBool(
-                 "CUDA_PTX_COMPILATION")) {
-      cmdVar = "CMAKE_CUDA_COMPILE_PTX_COMPILATION";
+      const std::string& rdcFlag =
+        this->Makefile->GetRequiredDefinition("_CMAKE_CUDA_RDC_FLAG");
+      cudaCompileMode = cmStrCat(cudaCompileMode, rdcFlag, " ");
+    }
+    if (this->GeneratorTarget->GetPropertyAsBool("CUDA_PTX_COMPILATION")) {
+      const std::string& ptxFlag =
+        this->Makefile->GetRequiredDefinition("_CMAKE_CUDA_PTX_FLAG");
+      cudaCompileMode = cmStrCat(cudaCompileMode, ptxFlag);
     } else {
-      cmdVar = "CMAKE_CUDA_COMPILE_WHOLE_COMPILATION";
+      const std::string& wholeFlag =
+        this->Makefile->GetRequiredDefinition("_CMAKE_CUDA_WHOLE_FLAG");
+      cudaCompileMode = cmStrCat(cudaCompileMode, wholeFlag);
     }
-    const std::string& compileCmd =
-      this->GetMakefile()->GetRequiredDefinition(cmdVar);
-    cmExpandList(compileCmd, compileCmds);
-  } else {
-    const std::string cmdVar = cmStrCat("CMAKE_", language, "_COMPILE_OBJECT");
-    const std::string& compileCmd =
-      this->GetMakefile()->GetRequiredDefinition(cmdVar);
-    cmExpandList(compileCmd, compileCmds);
+    compileObjectVars.CudaCompileMode = cudaCompileMode.c_str();
   }
 
+  std::vector<std::string> compileCmds;
+  const std::string cmdVar = cmStrCat("CMAKE_", language, "_COMPILE_OBJECT");
+  const std::string& compileCmd =
+    this->Makefile->GetRequiredDefinition(cmdVar);
+  cmExpandList(compileCmd, compileCmds);
+
   std::unique_ptr<cmRulePlaceholderExpander> rulePlaceholderExpander(
     this->GetLocalGenerator()->CreateRulePlaceholderExpander());
 
diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt
index 02f043f362b..39bcd918f27 100644
--- a/Tests/CudaOnly/WithDefs/CMakeLists.txt
+++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.18)
 project(WithDefs CUDA)
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 set(release_compile_defs DEFREL)
 
 #Goal for this example:

From 7a614977f9443146e8b423b6dc5a11a7c79862ce Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Tue, 29 Mar 2022 16:26:26 -0400
Subject: [PATCH 05/35] CMakeDependentOption: improve documentation

This makes it far clearer that `<depends>` is a list up front instead of
burying the lede because a list is generally "trivially true" in CMake[1].
Also clarify that `<force>` is only available as a local variable and if
queried outside of the "scope" of the `cmake_dependent_option` call,
will get the stored user cache value.

[1] The exception being when the last entry ends in `-NOTFOUND`.

Suggested-by: Rui Oliveira
---
 Modules/CMakeDependentOption.cmake | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Modules/CMakeDependentOption.cmake b/Modules/CMakeDependentOption.cmake
index b7c478f6440..ac0e2624a33 100644
--- a/Modules/CMakeDependentOption.cmake
+++ b/Modules/CMakeDependentOption.cmake
@@ -16,13 +16,18 @@ conditions are true.
 
     cmake_dependent_option(<option> "<help_text>" <value> <depends> <force>)
 
-  Makes ``<option>`` available to the user if ``<depends>`` is true. When
-  ``<option>`` is available, the given ``<help_text>`` and initial ``<value>``
-  are used. If the ``<depends>`` condition is not true, ``<option>`` will not be
-  presented and will always have the value given by ``<force>``. Any value set by
-  the user is preserved for when the option is presented again. In case ``<depends>``
-  is a :ref:`semicolon-separated list <CMake Language Lists>`, all elements must
-  be true in order to initialize ``<option>`` with ``<value>``.
+  Makes ``<option>`` available to the user if the
+  :ref:`semicolon-separated list <CMake Language Lists>` of conditions in
+  ``<depends>`` are all true.  Otherwise, a local variable named ``<option>``
+  is set to ``<force>``.
+
+  When ``<option>`` is available, the given ``<help_text>`` and initial
+  ``<value>`` are used. Otherwise, any value set by the user is preserved for
+  when ``<depends>`` is satisfied in the future.
+
+  Note that the ``<option>`` variable only has a value which satisfies the
+  ``<depends>`` condition within the scope of the caller because it is a local
+  variable.
 
 Example invocation:
 

From 9993774172f62ec7b0b69efc232e0a9fbc894394 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 1 Apr 2022 10:04:40 -0400
Subject: [PATCH 06/35] Help: Clarify when policy CMP0112 takes effect

Fixes: #23381
---
 Help/policy/CMP0112.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Help/policy/CMP0112.rst b/Help/policy/CMP0112.rst
index 313a51e82d1..5b00d071054 100644
--- a/Help/policy/CMP0112.rst
+++ b/Help/policy/CMP0112.rst
@@ -24,7 +24,9 @@ file name components no longer add a dependency on the evaluated target.
 In CMake 3.18 and lower a dependency on the evaluated target of the above
 generator expressions would always be added.  CMake 3.19 and above prefer
 to not add this dependency.  This policy provides compatibility for projects
-that have not been updated to expect the new behavior.
+that have not been updated to expect the new behavior.  The policy setting
+is recorded on each target when it is created, and decides whether generator
+expressions referencing that target imply a dependency on it.
 
 The ``OLD`` behavior for this policy is to add a dependency on the evaluated
 target for the above generator expressions.  The ``NEW`` behavior of

From 7431759ebc5d24ffbad443c83119aaff02a8020e Mon Sep 17 00:00:00 2001
From: Eugene Shalygin <eugene.shalygin@gmail.com>
Date: Thu, 22 Jul 2021 19:41:53 +0200
Subject: [PATCH 07/35] Help: Fix typo in install command documentation

---
 Help/command/install.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Help/command/install.rst b/Help/command/install.rst
index 14f7ff79177..1a9dfd70cb3 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -828,7 +828,7 @@ of the ``Development`` component in the package metadata, ensuring that the
 library is always installed if the headers and CMake export file are present.
 
 .. versionadded:: 3.7
-  In addition to cmake language files, the ``EXPORT_ANDROID_MK`` mode maybe
+  In addition to cmake language files, the ``EXPORT_ANDROID_MK`` mode may be
   used to specify an export to the android ndk build system.  This mode
   accepts the same options as the normal export mode.  The Android
   NDK supports the use of prebuilt libraries, both static and shared. This

From 3a9a9a3ace76c2d3b8b08d60dc219bffcc619928 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 4 Apr 2022 12:51:10 -0400
Subject: [PATCH 08/35] gitlab-ci: clarify name of package upload job template

The template is used to upload both source and binary packages.
---
 .gitlab-ci.yml     | 10 +++++-----
 .gitlab/upload.yml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06570d91beb..838b8fc31ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,7 +61,7 @@ p:doc-package:
 
 .u:source-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - p:source-package
@@ -531,7 +531,7 @@ b:linux-x86_64-package:
 
 .u:linux-x86_64-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:linux-x86_64-package
@@ -555,7 +555,7 @@ b:linux-aarch64-package:
 
 .u:linux-aarch64-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:linux-aarch64-package
@@ -696,7 +696,7 @@ b:macos-package:
 
 .u:macos-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:macos-package
@@ -719,7 +719,7 @@ b:macos10.10-package:
 
 .u:macos10.10-package:
     extends:
-        - .rsync_upload_binary
+        - .rsync_upload_package
         - .run_only_for_package
     dependencies:
         - b:macos10.10-package
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 693388d9bf9..287b1054c7a 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -1,6 +1,6 @@
 # Steps for uploading artifacts
 
-.rsync_upload_binary:
+.rsync_upload_package:
     image: "fedora:34"
     stage: upload
     tags:

From cb44e0d47c2ea63f60688a254f6018a8c435a554 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 4 Apr 2022 12:08:40 -0400
Subject: [PATCH 09/35] gitlab-ci: distinguish release and development pipeline
 schedules

Redefine the `CMAKE_CI_PACKAGE` pipeline schedule variable to
indicate whether it is for a development version (`dev`) or a
release version (`v[0-9]...`).  Use this to automatically turn
package upload jobs on or off without having to edit the jobs
in `.gitlab-ci.yml` for release branches.
---
 .gitlab-ci.yml     | 20 +++++---------------
 .gitlab/rules.yml  | 12 ++++++++----
 .gitlab/upload.yml |  3 +++
 Help/dev/maint.rst | 18 +-----------------
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 838b8fc31ae..d5529dfc0d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ p:doc-package:
         - .cmake_doc_artifacts
         - .run_only_for_package
 
-.u:source-package:
+u:source-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
@@ -67,8 +67,6 @@ p:doc-package:
         - p:source-package
     needs:
         - p:source-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 # Documentation builds
 
@@ -529,7 +527,7 @@ b:linux-x86_64-package:
     needs:
         - p:doc-package
 
-.u:linux-x86_64-package:
+u:linux-x86_64-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
@@ -537,8 +535,6 @@ b:linux-x86_64-package:
         - b:linux-x86_64-package
     needs:
         - b:linux-x86_64-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 b:linux-aarch64-package:
     extends:
@@ -553,7 +549,7 @@ b:linux-aarch64-package:
     needs:
         - p:doc-package
 
-.u:linux-aarch64-package:
+u:linux-aarch64-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
@@ -561,8 +557,6 @@ b:linux-aarch64-package:
         - b:linux-aarch64-package
     needs:
         - b:linux-aarch64-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 ## Sanitizer builds
 
@@ -694,7 +688,7 @@ b:macos-package:
     needs:
         - p:doc-package
 
-.u:macos-package:
+u:macos-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
@@ -702,8 +696,6 @@ b:macos-package:
         - b:macos-package
     needs:
         - b:macos-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 b:macos10.10-package:
     extends:
@@ -717,7 +709,7 @@ b:macos10.10-package:
     needs:
         - p:doc-package
 
-.u:macos10.10-package:
+u:macos10.10-package:
     extends:
         - .rsync_upload_package
         - .run_only_for_package
@@ -725,8 +717,6 @@ b:macos10.10-package:
         - b:macos10.10-package
     needs:
         - b:macos10.10-package
-    variables:
-        RSYNC_DESTINATION: dev
 
 # Windows builds
 
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index a871b8f6f28..88aa8e6f943 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -2,7 +2,7 @@
 
 .run_manually:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null'
           when: never
         - if: '$CMAKE_CI_NIGHTLY == "true"'
           when: on_success
@@ -23,7 +23,7 @@
 
 .run_automatically:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null'
           when: never
         - if: '$CMAKE_CI_NIGHTLY == "true"'
           when: on_success
@@ -44,7 +44,7 @@
 
 .run_dependent:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null'
           when: never
         - if: '($CMAKE_CI_NIGHTLY == "true" && $CMAKE_CI_NIGHTLY_IGNORE_DEPS == "true")'
           when: always
@@ -62,7 +62,11 @@
 
 .run_only_for_package:
     rules:
-        - if: '$CMAKE_CI_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE != null && $CMAKE_CI_JOB_UPLOAD_PACKAGE == null'
+          when: on_success
+        - if: '$CMAKE_CI_PACKAGE == "dev" && $CMAKE_CI_JOB_UPLOAD_PACKAGE == "true"'
+          variables:
+              RSYNC_DESTINATION: "dev"
           when: on_success
         - when: never
 
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 287b1054c7a..88ceba894c7 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -18,6 +18,9 @@
         - ssh-keygen -y -f $RSYNC_BINARY_KEY > $RSYNC_BINARY_KEY.pub
         - rsync -tv --recursive -e "ssh -i $RSYNC_BINARY_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/ kitware@cmake.org:$RSYNC_DESTINATION/
 
+    variables:
+        CMAKE_CI_JOB_UPLOAD_PACKAGE: "true"
+
 .rsync_upload_help:
     stage: upload
     image: "fedora:34"
diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst
index 54d627dd52d..4c2b6a14bfb 100644
--- a/Help/dev/maint.rst
+++ b/Help/dev/maint.rst
@@ -245,20 +245,6 @@ Commit with a message such as::
   Release versions do not have the development topic section of
   the CMake Release Notes index page.
 
-Update ``.gitlab-ci.yml`` to drop the upload jobs from the
-packaging pipeline by renaming them to start in ``.``:
-
-.. code-block:: shell
-
-  sed -i 's/^u:/.u:/' .gitlab-ci.yml
-
-Commit with a message such as::
-
-  gitlab-ci: Drop package pipeline upload jobs for release branch
-
-  The package pipeline for release versions should not upload packages
-  automatically to our archive of nightly development versions.
-
 Update ``Source/CMakeVersion.cmake`` to set the version to
 ``$major.$minor.0-rc0``:
 
@@ -290,15 +276,13 @@ Merge the ``release-$ver`` branch to ``master``:
   git merge --no-ff release-$ver
 
 Begin post-release development by restoring the development branch release
-note infrastructure, the nightly package pipeline upload jobs, and
-the version date from ``origin/master``:
+note infrastructure, and the version date from ``origin/master``:
 
 .. code-block:: shell
 
   git checkout origin/master -- \
     Source/CMakeVersion.cmake Help/release/dev/0-sample-topic.rst
   sed -i $'/^Releases/ i\\\n.. include:: dev.txt\\\n' Help/release/index.rst
-  sed -i 's/^\.u:/u:/' .gitlab-ci.yml
 
 Update ``Source/CMakeVersion.cmake`` to set the version to
 ``$major.$minor.$date``:

From 9a1b301c8564a75bb7781dfb9241c0bf7974f882 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 5 Apr 2022 14:21:29 -0400
Subject: [PATCH 10/35] gitlab-ci: add sanity check to upload jobs

Ensure that the upload destination is not empty.
---
 .gitlab/upload.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 88ceba894c7..20ec48368a3 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -16,6 +16,7 @@
         - dnf install -y --setopt=install_weak_deps=False rsync openssh-clients
         - chmod 400 $RSYNC_BINARY_KEY
         - ssh-keygen -y -f $RSYNC_BINARY_KEY > $RSYNC_BINARY_KEY.pub
+        - test -n "$RSYNC_DESTINATION"
         - rsync -tv --recursive -e "ssh -i $RSYNC_BINARY_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/ kitware@cmake.org:$RSYNC_DESTINATION/
 
     variables:
@@ -37,4 +38,5 @@
         - dnf install -y --setopt=install_weak_deps=False rsync openssh-clients
         - chmod 400 $RSYNC_HELP_KEY
         - ssh-keygen -y -f $RSYNC_HELP_KEY > $RSYNC_HELP_KEY.pub
+        - test -n "$RSYNC_DESTINATION"
         - rsync -tv --recursive --delete -e "ssh -i $RSYNC_HELP_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/html/ kitware@cmake.org:$RSYNC_DESTINATION/

From 3a90800a9cc5b80f80e7139254776008cb9fa452 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 5 Apr 2022 14:49:27 -0400
Subject: [PATCH 11/35] gitlab-ci: simplify package pipeline job conditions

Use the job stage to distinguish upload jobs instead of an
explicit variable.
---
 .gitlab/rules.yml  | 6 +++---
 .gitlab/upload.yml | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 88aa8e6f943..e4267d53161 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -62,12 +62,12 @@
 
 .run_only_for_package:
     rules:
-        - if: '$CMAKE_CI_PACKAGE != null && $CMAKE_CI_JOB_UPLOAD_PACKAGE == null'
-          when: on_success
-        - if: '$CMAKE_CI_PACKAGE == "dev" && $CMAKE_CI_JOB_UPLOAD_PACKAGE == "true"'
+        - if: '$CMAKE_CI_PACKAGE == "dev"'
           variables:
               RSYNC_DESTINATION: "dev"
           when: on_success
+        - if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE != "upload"'
+          when: on_success
         - when: never
 
 .run_only_for_continuous_master:
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 20ec48368a3..a4cbbdee319 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -19,9 +19,6 @@
         - test -n "$RSYNC_DESTINATION"
         - rsync -tv --recursive -e "ssh -i $RSYNC_BINARY_KEY -o StrictHostKeyChecking=no -o LogLevel=ERROR" build/ kitware@cmake.org:$RSYNC_DESTINATION/
 
-    variables:
-        CMAKE_CI_JOB_UPLOAD_PACKAGE: "true"
-
 .rsync_upload_help:
     stage: upload
     image: "fedora:34"

From eb410615f232647912687bedb0239d0912273bac Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 5 Apr 2022 14:55:05 -0400
Subject: [PATCH 12/35] gitlab-ci: start release package pipelines manually

A release pipeline is always created by manual execution of a pipeline
schedule.  Require the initial pipeline jobs to be started manually too
so that we can later add separate components to play separately.
---
 .gitlab/rules.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index e4267d53161..5642c1595ca 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -66,6 +66,8 @@
           variables:
               RSYNC_DESTINATION: "dev"
           when: on_success
+        - if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE == "prep"'
+          when: manual
         - if: '$CMAKE_CI_PACKAGE != null && $CI_JOB_STAGE != "upload"'
           when: on_success
         - when: never

From cca73b54ae6a25f50b17cf32077ca85020340d92 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 1 Apr 2022 21:47:42 -0400
Subject: [PATCH 13/35] Utilities/Sphinx: Add undocumented option to build docs
 for cmake.org

---
 .gitlab/os-linux.yml                   |  3 ++-
 Utilities/Sphinx/CMakeLists.txt        | 33 +++++++++++++++++++++++---
 Utilities/Sphinx/conf.py.in            |  1 +
 Utilities/Sphinx/templates/layout.html | 22 ++++++++++++++---
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 90c10a25d0f..48d4279daa6 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -490,5 +490,6 @@
         - *before_script_linux
         - mkdir -p build/
         - cd build/
-        - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON -DSPHINX_FLAGS="-A versionswitch=1"
+        - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON
+          -DCMake_SPHINX_CMAKE_ORG=ON
         - ninja
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index c8a970dcafc..65760367eac 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -49,6 +49,12 @@ else()
   set(conf_copyright "Kitware, Inc.")
 endif()
 
+if(CMake_SPHINX_CMAKE_ORG)
+  set(conf_baseurl "https://cmake.org/cmake/help/latest")
+else()
+  set(conf_baseurl "")
+endif()
+
 set(conf_docs "${CMake_SOURCE_DIR}/Help")
 set(conf_path "${CMAKE_CURRENT_SOURCE_DIR}")
 set(conf_version "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
@@ -129,11 +135,24 @@ if(SPHINX_LATEXPDF)
   list(APPEND doc_formats latexpdf)
 endif()
 
+set(doc_html_opts "")
+if(CMake_SPHINX_CMAKE_ORG)
+  list(APPEND doc_html_opts
+    -A googleanalytics=1
+    -A versionswitch=1
+    )
+endif()
+
 set(doc_format_outputs "")
 set(doc_format_last "")
 foreach(format ${doc_formats})
   set(doc_format_output "doc_format_${format}")
   set(doc_format_log "build-${format}.log")
+  if(CMake_SPHINX_CMAKE_ORG)
+    set(doctrees "doctrees/${format}")
+  else()
+    set(doctrees "doctrees")
+  endif()
   if(format STREQUAL "latexpdf")
     # This format does not use builder (-b) but make_mode (-M) which expects
     # arguments in peculiar order
@@ -144,8 +163,9 @@ foreach(format ${doc_formats})
               ${CMake_SOURCE_DIR}/Help
               ${CMAKE_CURRENT_BINARY_DIR}/${format}
               -c ${CMAKE_CURRENT_BINARY_DIR}
-              -d ${CMAKE_CURRENT_BINARY_DIR}/doctrees
+              -d ${CMAKE_CURRENT_BINARY_DIR}/${doctrees}
               ${sphinx_flags}
+              ${doc_${format}_opts}
               > ${doc_format_log} # log stdout, pass stderr
       ${${format}_extra_commands}
       DEPENDS ${doc_format_last}
@@ -158,9 +178,10 @@ foreach(format ${doc_formats})
       OUTPUT ${doc_format_output}
       COMMAND ${SPHINX_EXECUTABLE}
               -c ${CMAKE_CURRENT_BINARY_DIR}
-              -d ${CMAKE_CURRENT_BINARY_DIR}/doctrees
+              -d ${CMAKE_CURRENT_BINARY_DIR}/${doctrees}
               -b ${format}
               ${sphinx_flags}
+              ${doc_${format}_opts}
               ${CMake_SOURCE_DIR}/Help
               ${CMAKE_CURRENT_BINARY_DIR}/${format}
               > ${doc_format_log} # log stdout, pass stderr
@@ -172,7 +193,9 @@ foreach(format ${doc_formats})
   endif()
   set_property(SOURCE ${doc_format_output} PROPERTY SYMBOLIC 1)
   list(APPEND doc_format_outputs ${doc_format_output})
-  set(doc_format_last ${doc_format_output})
+  if(NOT CMake_SPHINX_CMAKE_ORG)
+    set(doc_format_last ${doc_format_output})
+  endif()
 endforeach()
 
 add_custom_target(documentation ALL DEPENDS ${doc_format_outputs})
@@ -192,6 +215,10 @@ if(CMake_SPHINX_DEPEND_ON_EXECUTABLES)
   endforeach()
 endif()
 
+if(CMake_SPHINX_CMAKE_ORG)
+  return()
+endif()
+
 if(SPHINX_INFO)
   CMake_OPTIONAL_COMPONENT(sphinx-info)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/texinfo/cmake.info
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
index c383828bd71..2b3083b046e 100644
--- a/Utilities/Sphinx/conf.py.in
+++ b/Utilities/Sphinx/conf.py.in
@@ -55,6 +55,7 @@ for fpath in cmake_manuals:
 man_show_urls = False
 man_make_section_directory = False
 
+html_baseurl = '@conf_baseurl@'
 html_show_sourcelink = True
 html_static_path = ['@conf_path@/static']
 html_style = 'cmake.css'
diff --git a/Utilities/Sphinx/templates/layout.html b/Utilities/Sphinx/templates/layout.html
index be2660caa0f..0cc5c26afe1 100644
--- a/Utilities/Sphinx/templates/layout.html
+++ b/Utilities/Sphinx/templates/layout.html
@@ -18,9 +18,9 @@
 {% endblock %}
 
 {% block extrahead %}
-  {% if versionswitch is defined %}
-  <script type="text/javascript" src="{{ pathto('../version_switch.js', 1) }}"></script>
-  {% endif %}
+  {%- if versionswitch is defined %}
+    <script type="text/javascript" src="{{ pathto('../version_switch.js', 1) }}"></script>
+  {%- endif %}
 {{ super() }}
 {% endblock %}
 
@@ -29,3 +29,19 @@
 {% block htmltitle %}
   <title>{{ title|striptags|e }} {{ "&mdash;"|safe }} {{ docstitle|e }}</title>
 {% endblock %}
+
+{%- block footer %}
+{{ super() }}
+{%- if googleanalytics is defined %}
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-6042509-4");
+pageTracker._trackPageview();
+} catch(err) {}
+</script>
+{%- endif %}
+{%- endblock %}

From a14905d4df6c47dbcd574f05ad0a324906dd1329 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 1 Apr 2022 22:09:50 -0400
Subject: [PATCH 14/35] Utilities/Sphinx: Add option to build outdated version
 banner for cmake.org

This was previously added in a custom branch for building the
cmake.org reference documentation.
---
 .gitlab/os-linux.yml                   |  1 +
 Utilities/Sphinx/CMakeLists.txt        |  4 ++++
 Utilities/Sphinx/static/cmake.css      | 12 ++++++++++++
 Utilities/Sphinx/templates/layout.html | 13 +++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 48d4279daa6..4a87b215229 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -492,4 +492,5 @@
         - cd build/
         - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON
           -DCMake_SPHINX_CMAKE_ORG=ON
+          -DCMake_SPHINX_CMAKE_ORG_OUTDATED=$CMAKE_CI_SPHINX_OUTDATED
         - ninja
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 65760367eac..dd70ce68525 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -141,6 +141,10 @@ if(CMake_SPHINX_CMAKE_ORG)
     -A googleanalytics=1
     -A versionswitch=1
     )
+
+  if(CMake_SPHINX_CMAKE_ORG_OUTDATED)
+    list(APPEND doc_html_opts -A outdated=1)
+  endif()
 endif()
 
 set(doc_format_outputs "")
diff --git a/Utilities/Sphinx/static/cmake.css b/Utilities/Sphinx/static/cmake.css
index 029eb1b2fcc..4539cf96f65 100644
--- a/Utilities/Sphinx/static/cmake.css
+++ b/Utilities/Sphinx/static/cmake.css
@@ -22,3 +22,15 @@ div.sphinxsidebarwrapper {
 dd > :first-child > p {
   margin-top: 0px;
 }
+
+div.outdated {
+  background-color: #f0f0c0;
+  color: black;
+  font-size: 90%;
+  padding-bottom: 5px;
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 5px;
+  text-align: center;
+  width: 100%;
+}
diff --git a/Utilities/Sphinx/templates/layout.html b/Utilities/Sphinx/templates/layout.html
index 0cc5c26afe1..d02b44d9e30 100644
--- a/Utilities/Sphinx/templates/layout.html
+++ b/Utilities/Sphinx/templates/layout.html
@@ -17,6 +17,19 @@
   </li>
 {% endblock %}
 
+{%- block relbar1 %}
+{{ super() }}
+{%- if outdated is defined %}
+    <div class="outdated">
+      This documents an old version of CMake.
+      <a href="https://cmake.org/cmake/help/latest/{{ pagename }}.html">
+        Click here to see the latest release.
+      </a>
+      <span class="version_switch_note"></span>
+    </div>
+{%- endif %}
+{%- endblock %}
+
 {% block extrahead %}
   {%- if versionswitch is defined %}
     <script type="text/javascript" src="{{ pathto('../version_switch.js', 1) }}"></script>

From 5c2e8ce515bc1f47ac6dd6d5b55bfe7f45190a02 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 1 Apr 2022 22:12:41 -0400
Subject: [PATCH 15/35] Utilities/Sphinx: Add OpenSearch link to html page
 headers on cmake.org

Reference an OpenSearch description file that sits outside the content
of any specific version so we only need to maintain one and so that
it can reference the latest version.

This was previously added in a custom branch for building the
cmake.org reference documentation.
---
 Utilities/Sphinx/CMakeLists.txt        | 1 +
 Utilities/Sphinx/templates/layout.html | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index dd70ce68525..14d0e14f56b 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -139,6 +139,7 @@ set(doc_html_opts "")
 if(CMake_SPHINX_CMAKE_ORG)
   list(APPEND doc_html_opts
     -A googleanalytics=1
+    -A opensearch=1
     -A versionswitch=1
     )
 
diff --git a/Utilities/Sphinx/templates/layout.html b/Utilities/Sphinx/templates/layout.html
index d02b44d9e30..8fb7c427322 100644
--- a/Utilities/Sphinx/templates/layout.html
+++ b/Utilities/Sphinx/templates/layout.html
@@ -31,6 +31,11 @@
 {%- endblock %}
 
 {% block extrahead %}
+  {%- if opensearch is defined %}
+    <link rel="search" type="application/opensearchdescription+xml"
+          title="Search within CMake Documentation of Latest Version"
+          href="{{ pathto('../latest-opensearch.xml', 1) }}"/>
+  {%- endif %}
   {%- if versionswitch is defined %}
     <script type="text/javascript" src="{{ pathto('../version_switch.js', 1) }}"></script>
   {%- endif %}

From ed00a29ccef7d1a6757c040cf10e9cb720080340 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 4 Apr 2022 12:04:35 -0400
Subject: [PATCH 16/35] gitlab-ci: consolidate jobs for
 cmake.org/cmake/help/git-{master,stage} docs

---
 .gitlab-ci.yml    | 30 ++++++------------------------
 .gitlab/rules.yml | 10 +++++-----
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5529dfc0d9..0585579f4cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,37 +70,19 @@ u:source-package:
 
 # Documentation builds
 
-b:help:master:
+b:cmake.org-help:
     extends:
         - .cmake_org_help
-        - .run_only_for_continuous_master
+        - .run_cmake_org_help
 
-.u:help:master:
+u:cmake.org-help:
     extends:
         - .rsync_upload_help
-        - .run_only_for_continuous_master
-    variables:
-        RSYNC_DESTINATION: git-master
-    dependencies:
-        - b:help:master
-    needs:
-        - b:help:master
-
-b:help:stage:
-    extends:
-        - .cmake_org_help
-        - .run_only_for_continuous_stage
-
-.u:help:stage:
-    extends:
-        - .rsync_upload_help
-        - .run_only_for_continuous_stage
-    variables:
-        RSYNC_DESTINATION: git-stage
+        - .run_cmake_org_help
     dependencies:
-        - b:help:stage
+        - b:cmake.org-help
     needs:
-        - b:help:stage
+        - b:cmake.org-help
 
 # Lint builds
 
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index 5642c1595ca..def89a0b210 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -72,14 +72,14 @@
           when: on_success
         - when: never
 
-.run_only_for_continuous_master:
+.run_cmake_org_help:
     rules:
         - if: '$CMAKE_CI_PROJECT_MAIN_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_MAIN_BRANCH == $CI_COMMIT_BRANCH'
+          variables:
+              RSYNC_DESTINATION: "git-master"
           when: on_success
-        - when: never
-
-.run_only_for_continuous_stage:
-    rules:
         - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH'
+          variables:
+              RSYNC_DESTINATION: "git-stage"
           when: on_success
         - when: never

From 2808281730b2c887da1845f86042566991be5a8a Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 4 Apr 2022 13:52:04 -0400
Subject: [PATCH 17/35] gitlab-ci: update cmake.org documentation in release
 package pipeline

---
 .gitlab-ci.yml       | 2 ++
 .gitlab/os-linux.yml | 1 +
 .gitlab/rules.yml    | 7 +++++++
 3 files changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0585579f4cb..60b1beb3b83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,6 +74,8 @@ b:cmake.org-help:
     extends:
         - .cmake_org_help
         - .run_cmake_org_help
+    dependencies: []
+    needs: []
 
 u:cmake.org-help:
     extends:
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 4a87b215229..3d2c8272f8f 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -493,4 +493,5 @@
         - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON
           -DCMake_SPHINX_CMAKE_ORG=ON
           -DCMake_SPHINX_CMAKE_ORG_OUTDATED=$CMAKE_CI_SPHINX_OUTDATED
+          -DCMake_VERSION_NO_GIT=$CMAKE_CI_VERSION_NO_GIT
         - ninja
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index def89a0b210..bc51d775bc6 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -74,12 +74,19 @@
 
 .run_cmake_org_help:
     rules:
+        - if: '$CMAKE_CI_PACKAGE =~ /v[0-9]+\.[0-9]+/'
+          variables:
+              RSYNC_DESTINATION: "$CMAKE_CI_PACKAGE"
+              CMAKE_CI_VERSION_NO_GIT: "ON"
+          when: manual
         - if: '$CMAKE_CI_PROJECT_MAIN_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_MAIN_BRANCH == $CI_COMMIT_BRANCH'
           variables:
               RSYNC_DESTINATION: "git-master"
+              CMAKE_CI_VERSION_NO_GIT: "OFF"
           when: on_success
         - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH'
           variables:
               RSYNC_DESTINATION: "git-stage"
+              CMAKE_CI_VERSION_NO_GIT: "OFF"
           when: on_success
         - when: never

From 1ceec19c208f0655362ce360a5402f613c393f3c Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 6 Apr 2022 09:24:18 -0400
Subject: [PATCH 18/35] gitlab-ci: Add objects.inv to cmake.org html
 documentation

---
 .gitlab/artifacts.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml
index 982f50b3bdb..5472c0ace9f 100644
--- a/.gitlab/artifacts.yml
+++ b/.gitlab/artifacts.yml
@@ -116,4 +116,3 @@
             - build/html
         exclude:
             - build/html/.buildinfo
-            - build/html/objects.inv

From b691906d271e2cb3dba09ef8ec07d05278976257 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 6 Apr 2022 09:25:38 -0400
Subject: [PATCH 19/35] gitlab-ci: Build qthelp-format release documentation
 for cmake.org

Previously the qthelp-format release documentation on `cmake.org` was
built manually.
---
 .gitlab/os-linux.yml            | 4 +++-
 .gitlab/rules.yml               | 3 +++
 Utilities/Sphinx/CMakeLists.txt | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 3d2c8272f8f..2d7ace62b17 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -490,7 +490,9 @@
         - *before_script_linux
         - mkdir -p build/
         - cd build/
-        - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON
+        - cmake ../Utilities/Sphinx -GNinja
+          -DSPHINX_HTML=ON
+          -DSPHINX_QTHELP=$CMAKE_CI_SPHINX_QTHELP
           -DCMake_SPHINX_CMAKE_ORG=ON
           -DCMake_SPHINX_CMAKE_ORG_OUTDATED=$CMAKE_CI_SPHINX_OUTDATED
           -DCMake_VERSION_NO_GIT=$CMAKE_CI_VERSION_NO_GIT
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index bc51d775bc6..20603f52fdf 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -77,16 +77,19 @@
         - if: '$CMAKE_CI_PACKAGE =~ /v[0-9]+\.[0-9]+/'
           variables:
               RSYNC_DESTINATION: "$CMAKE_CI_PACKAGE"
+              CMAKE_CI_SPHINX_QTHELP: "ON"
               CMAKE_CI_VERSION_NO_GIT: "ON"
           when: manual
         - if: '$CMAKE_CI_PROJECT_MAIN_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_MAIN_BRANCH == $CI_COMMIT_BRANCH'
           variables:
               RSYNC_DESTINATION: "git-master"
+              CMAKE_CI_SPHINX_QTHELP: "OFF"
               CMAKE_CI_VERSION_NO_GIT: "OFF"
           when: on_success
         - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH'
           variables:
               RSYNC_DESTINATION: "git-stage"
+              CMAKE_CI_SPHINX_QTHELP: "OFF"
               CMAKE_CI_VERSION_NO_GIT: "OFF"
           when: on_success
         - when: never
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 14d0e14f56b..402c7c6f671 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -146,6 +146,12 @@ if(CMake_SPHINX_CMAKE_ORG)
   if(CMake_SPHINX_CMAKE_ORG_OUTDATED)
     list(APPEND doc_html_opts -A outdated=1)
   endif()
+
+  list(APPEND qthelp_extra_commands
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qch"
+      "${CMAKE_CURRENT_BINARY_DIR}/html/CMake.qch"
+    )
 endif()
 
 set(doc_format_outputs "")

From f779f8c0ad4c16cda5a166d440915a01e986d396 Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyle.edwards@kitware.com>
Date: Wed, 6 Apr 2022 16:40:34 -0400
Subject: [PATCH 20/35] FILE_SET: Forbid adding header sets to Apple FRAMEWORK
 libraries

The feature needs a specialized implementation to place headers
in the right place inside frameworks.  To avoid silently doing
the wrong thing, make this case an error for the 3.23 series.

Issue: #23386
---
 Help/command/target_sources.rst                    |  2 +-
 Help/release/3.23.rst                              | 14 ++++++++++++++
 Source/cmTargetSourcesCommand.cxx                  |  4 ++++
 .../target_sources/FileSetFramework-result.txt     |  1 +
 .../target_sources/FileSetFramework-stderr.txt     |  4 ++++
 .../RunCMake/target_sources/FileSetFramework.cmake |  7 +++++++
 Tests/RunCMake/target_sources/RunCMakeTest.cmake   |  3 +++
 7 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 Tests/RunCMake/target_sources/FileSetFramework-result.txt
 create mode 100644 Tests/RunCMake/target_sources/FileSetFramework-stderr.txt
 create mode 100644 Tests/RunCMake/target_sources/FileSetFramework.cmake

diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index 6ad86e3f8e7..1ad6c373e2e 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -77,7 +77,7 @@ have zero or more named file sets. Each file set has a name, a type, a scope of
 ``INTERFACE``, ``PUBLIC``, or ``PRIVATE``, one or more base directories, and
 files within those directories. The only acceptable type is ``HEADERS``. The
 optional default file sets are named after their type. The target may not be a
-custom target.
+custom target or :prop_tgt:`FRAMEWORK` target.
 
 Files in a ``PRIVATE`` or ``PUBLIC`` file set are marked as source files for
 the purposes of IDE integration. Additionally, files in ``HEADERS`` file sets
diff --git a/Help/release/3.23.rst b/Help/release/3.23.rst
index 1a3f53ecc02..257c3d54487 100644
--- a/Help/release/3.23.rst
+++ b/Help/release/3.23.rst
@@ -264,3 +264,17 @@ Other Changes
 * :manual:`ccmake(1)` may now be enabled on Windows when building
   CMake from source.  This is experimental, and so is not included
   in official distributions.
+
+Updates
+=======
+
+Changes made since CMake 3.23.0 include the following.
+
+3.23.1
+------
+
+* The :command:`target_sources` ``FILE_SET`` feature added in CMake 3.23.0
+  does not yet place header files properly in Apple :prop_tgt:`FRAMEWORK`
+  targets.  Pending further work in a future version of CMake, it is now
+  an error to add a ``FILE_SET`` of type ``HEADERS`` to such targets on
+  Apple platforms.
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx
index 43a9b3ab31b..9173a34a3fa 100644
--- a/Source/cmTargetSourcesCommand.cxx
+++ b/Source/cmTargetSourcesCommand.cxx
@@ -230,6 +230,10 @@ bool TargetSourcesImpl::HandleOneFileSet(
     this->SetError("FILE_SETs may not be added to custom targets");
     return false;
   }
+  if (this->Target->IsFrameworkOnApple()) {
+    this->SetError("FILE_SETs may not be added to FRAMEWORK targets");
+    return false;
+  }
 
   bool const isDefault = args.Type == args.FileSet ||
     (args.Type.empty() && args.FileSet[0] >= 'A' && args.FileSet[0] <= 'Z');
diff --git a/Tests/RunCMake/target_sources/FileSetFramework-result.txt b/Tests/RunCMake/target_sources/FileSetFramework-result.txt
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/Tests/RunCMake/target_sources/FileSetFramework-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/target_sources/FileSetFramework-stderr.txt b/Tests/RunCMake/target_sources/FileSetFramework-stderr.txt
new file mode 100644
index 00000000000..ae7026a0e00
--- /dev/null
+++ b/Tests/RunCMake/target_sources/FileSetFramework-stderr.txt
@@ -0,0 +1,4 @@
+^CMake Error at FileSetFramework\.cmake:[0-9]+ \(target_sources\):
+  target_sources FILE_SETs may not be added to FRAMEWORK targets
+Call Stack \(most recent call first\):
+  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/target_sources/FileSetFramework.cmake b/Tests/RunCMake/target_sources/FileSetFramework.cmake
new file mode 100644
index 00000000000..d8a924fe3cb
--- /dev/null
+++ b/Tests/RunCMake/target_sources/FileSetFramework.cmake
@@ -0,0 +1,7 @@
+enable_language(C)
+
+add_library(lib1 SHARED lib1.c)
+set_property(TARGET lib1 PROPERTY FRAMEWORK ON)
+target_sources(lib1
+  PUBLIC FILE_SET HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES h1.h
+  )
diff --git a/Tests/RunCMake/target_sources/RunCMakeTest.cmake b/Tests/RunCMake/target_sources/RunCMakeTest.cmake
index d23bce19f10..743879e7c3b 100644
--- a/Tests/RunCMake/target_sources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/target_sources/RunCMakeTest.cmake
@@ -40,6 +40,9 @@ run_cmake(FileSetNoExistInstall)
 run_cmake(FileSetDirectories)
 run_cmake(FileSetCustomTarget)
 run_cmake(FileSetBadName)
+if(APPLE)
+  run_cmake(FileSetFramework)
+endif()
 
 set(RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0115=NEW)
 run_cmake(FileSetFileNoExist)

From 37904abb58fce06c34919484b2d6c470f204b2d6 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 7 Apr 2022 09:32:17 -0400
Subject: [PATCH 21/35] Help: Add "Updates" section header in 3.22 release
 notes

This was accidentally left out in commit 1461eff899 (Help: Add missing
3.22.1 section to the release notes, 2022-01-24, v3.22.2~1^2).
---
 Help/release/3.22.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Help/release/3.22.rst b/Help/release/3.22.rst
index 1f773e66c70..efac925f29c 100644
--- a/Help/release/3.22.rst
+++ b/Help/release/3.22.rst
@@ -143,6 +143,11 @@ Other Changes
 
 * The :cpack_gen:`CPack NSIS Generator` now requires NSIS 3.03 or later.
 
+Updates
+=======
+
+Changes made since CMake 3.22.0 include the following.
+
 3.22.1
 ------
 

From bf69fa32c4301482fcb3bbfb6733314b9e95c36f Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 7 Apr 2022 09:37:06 -0400
Subject: [PATCH 22/35] Utilities/Sphinx: Update qthelp generation to
 qhelpgenerator

`qcollectiongenerator` is deprecated in favor of `qhelpgenerator`.
---
 Utilities/Release/linux/aarch64/cache.txt  |  2 +-
 Utilities/Release/linux/x86_64/cache.txt   |  2 +-
 Utilities/Release/win/x86/cache-i386.txt   |  2 +-
 Utilities/Release/win/x86/cache-x86_64.txt |  2 +-
 Utilities/Sphinx/CMakeLists.txt            | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Utilities/Release/linux/aarch64/cache.txt b/Utilities/Release/linux/aarch64/cache.txt
index 0c2d9954ff1..ebfed73dd8b 100644
--- a/Utilities/Release/linux/aarch64/cache.txt
+++ b/Utilities/Release/linux/aarch64/cache.txt
@@ -32,7 +32,7 @@ SPHINX_EXECUTABLE:FILEPATH=/usr/local/bin/sphinx-build
 SPHINX_HTML:BOOL=ON
 SPHINX_MAN:BOOL=ON
 SPHINX_QTHELP:BOOL=ON
-QCOLLECTIONGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator
+QHELPGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator
 
 # We bootstrap as part of the build so skip its test.
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
diff --git a/Utilities/Release/linux/x86_64/cache.txt b/Utilities/Release/linux/x86_64/cache.txt
index e1f9fe33761..a422af3d2fd 100644
--- a/Utilities/Release/linux/x86_64/cache.txt
+++ b/Utilities/Release/linux/x86_64/cache.txt
@@ -32,7 +32,7 @@ SPHINX_EXECUTABLE:FILEPATH=/opt/rh/rh-python36/root/usr/bin/sphinx-build
 SPHINX_HTML:BOOL=ON
 SPHINX_MAN:BOOL=ON
 SPHINX_QTHELP:BOOL=ON
-QCOLLECTIONGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator
+QHELPGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator
 
 # We bootstrap as part of the build so skip its test.
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
diff --git a/Utilities/Release/win/x86/cache-i386.txt b/Utilities/Release/win/x86/cache-i386.txt
index 54a45d8fc47..1c5c7f98daa 100644
--- a/Utilities/Release/win/x86/cache-i386.txt
+++ b/Utilities/Release/win/x86/cache-i386.txt
@@ -24,7 +24,7 @@ SPHINX_EXECUTABLE:FILEPATH=C:/python3/Scripts/sphinx-build.exe
 SPHINX_HTML:BOOL=ON
 SPHINX_MAN:BOOL=ON
 SPHINX_QTHELP:BOOL=ON
-QCOLLECTIONGENERATOR_EXECUTABLE:PATH=C:/qt-i386/bin/qhelpgenerator.exe
+QHELPGENERATOR_EXECUTABLE:PATH=C:/qt-i386/bin/qhelpgenerator.exe
 
 # No bootstrap with MSVC tools.
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
diff --git a/Utilities/Release/win/x86/cache-x86_64.txt b/Utilities/Release/win/x86/cache-x86_64.txt
index 0b78c72b9c3..1c9b14c3b2a 100644
--- a/Utilities/Release/win/x86/cache-x86_64.txt
+++ b/Utilities/Release/win/x86/cache-x86_64.txt
@@ -24,7 +24,7 @@ SPHINX_EXECUTABLE:FILEPATH=C:/python3/Scripts/sphinx-build.exe
 SPHINX_HTML:BOOL=ON
 SPHINX_MAN:BOOL=ON
 SPHINX_QTHELP:BOOL=ON
-QCOLLECTIONGENERATOR_EXECUTABLE:PATH=C:/qt-x86_64/bin/qhelpgenerator.exe
+QHELPGENERATOR_EXECUTABLE:PATH=C:/qt-x86_64/bin/qhelpgenerator.exe
 
 # No bootstrap with MSVC tools.
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 402c7c6f671..981e554a7dd 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -102,12 +102,12 @@ endif()
 if(SPHINX_QTHELP)
   find_package(PythonInterp REQUIRED)
 
-  find_program(QCOLLECTIONGENERATOR_EXECUTABLE
-    NAMES qcollectiongenerator-qt5 qcollectiongenerator
-    DOC "qcollectiongenerator tool"
+  find_program(QHELPGENERATOR_EXECUTABLE
+    NAMES qhelpgenerator-qt5 qhelpgenerator
+    DOC "qhelpgenerator tool"
     )
-  if (NOT QCOLLECTIONGENERATOR_EXECUTABLE)
-    message(FATAL_ERROR "QCOLLECTIONGENERATOR_EXECUTABLE (qcollectiongenerator) not found!")
+  if(NOT QHELPGENERATOR_EXECUTABLE)
+    message(FATAL_ERROR "QHELPGENERATOR_EXECUTABLE (qhelpgenerator) not found!")
   endif()
   list(APPEND doc_formats qthelp)
 
@@ -127,7 +127,7 @@ if(SPHINX_QTHELP)
       "${CMAKE_CURRENT_SOURCE_DIR}/create_identifiers.py"
       "${CMAKE_CURRENT_BINARY_DIR}/qthelp/"
 
-    COMMAND ${QCOLLECTIONGENERATOR_EXECUTABLE}
+    COMMAND ${QHELPGENERATOR_EXECUTABLE}
       ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp
   )
 endif()

From 9dd585d12c54f6d0768aea6526ea627f81f436ad Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 7 Apr 2022 15:00:38 -0400
Subject: [PATCH 23/35] CheckCompilerFlag: Fix regression in locale environment
 preservation

Fix a typo from commit 660e0d80ae (internal/CheckCompilerFlag: rely on
common configuration, 2022-01-12, v3.23.0-rc1~124^2~1) that caused
locale environment variables to not be restored after they are set
during the check.
---
 Modules/Internal/CheckFlagCommonConfig.cmake             | 4 ++--
 .../RunCMake/CheckCompilerFlag/CheckCCompilerFlag.cmake  | 9 +++++++++
 .../CheckCompilerFlag/CheckCXXCompilerFlag.cmake         | 9 +++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Modules/Internal/CheckFlagCommonConfig.cmake b/Modules/Internal/CheckFlagCommonConfig.cmake
index 3934c0249be..c011c242389 100644
--- a/Modules/Internal/CheckFlagCommonConfig.cmake
+++ b/Modules/Internal/CheckFlagCommonConfig.cmake
@@ -59,8 +59,8 @@ macro(CMAKE_CHECK_FLAG_COMMON_INIT _FUNC _LANG _SRC _PATTERNS)
     return()
   endif()
   # Normalize locale during test compilation.
-  set(_locale_vars LC_ALL LC_MESSAGES LANG)
-  foreach(v IN LISTS _locale_vars)
+  set(_CFCC_locale_vars LC_ALL LC_MESSAGES LANG)
+  foreach(v IN LISTS _CFCC_locale_vars)
     set(_CMAKE_CHECK_FLAG_COMMON_CONFIG_locale_vars_saved_${v} "$ENV{${v}}")
     set(ENV{${v}} C)
   endforeach()
diff --git a/Tests/RunCMake/CheckCompilerFlag/CheckCCompilerFlag.cmake b/Tests/RunCMake/CheckCompilerFlag/CheckCCompilerFlag.cmake
index 79d67e53120..276158ce07c 100644
--- a/Tests/RunCMake/CheckCompilerFlag/CheckCCompilerFlag.cmake
+++ b/Tests/RunCMake/CheckCompilerFlag/CheckCCompilerFlag.cmake
@@ -4,6 +4,10 @@ include(CheckCompilerFlag)
 
 set(C 1) # test that this is tolerated
 
+# test that the check uses an isolated locale
+set(_env_LC_ALL "${LC_ALL}")
+set(ENV{LC_ALL} "BAD")
+
 check_compiler_flag(C "-_this_is_not_a_flag_" SHOULD_FAIL)
 if(SHOULD_FAIL)
   message(SEND_ERROR "invalid C compile flag didn't fail.")
@@ -22,3 +26,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") # LCC C compiler silently ignore -frtti i
     message(SEND_ERROR "${CMAKE_C_COMPILER_ID} compiler flag '-frtti' check passed but should have failed")
   endif()
 endif()
+
+if(NOT "$ENV{LC_ALL}" STREQUAL "BAD")
+  message(SEND_ERROR "ENV{LC_ALL} was not preserved by check_compiler_flag")
+endif()
+set(ENV{LC_ALL} ${_env_LC_ALL})
diff --git a/Tests/RunCMake/CheckCompilerFlag/CheckCXXCompilerFlag.cmake b/Tests/RunCMake/CheckCompilerFlag/CheckCXXCompilerFlag.cmake
index 4b20ebd1b07..dec31ec3ae4 100644
--- a/Tests/RunCMake/CheckCompilerFlag/CheckCXXCompilerFlag.cmake
+++ b/Tests/RunCMake/CheckCompilerFlag/CheckCXXCompilerFlag.cmake
@@ -4,6 +4,10 @@ include(CheckCompilerFlag)
 
 set(CXX 1) # test that this is tolerated
 
+# test that the check uses an isolated locale
+set(_env_LC_ALL "${LC_ALL}")
+set(ENV{LC_ALL} "BAD")
+
 check_compiler_flag(CXX "-_this_is_not_a_flag_" SHOULD_FAIL)
 if(SHOULD_FAIL)
   message(SEND_ERROR "invalid CXX compile flag didn't fail.")
@@ -15,3 +19,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|LCC|Clang" AND NOT "x${CMAKE_CXX_SIMULATE_
     message(SEND_ERROR "${CMAKE_CXX_COMPILER_ID} compiler flag '-x c++' check failed")
   endif()
 endif()
+
+if(NOT "$ENV{LC_ALL}" STREQUAL "BAD")
+  message(SEND_ERROR "ENV{LC_ALL} was not preserved by check_compiler_flag")
+endif()
+set(ENV{LC_ALL} ${_env_LC_ALL})

From a10fc754a6a12c681f3acc7efa84798f6c2ea799 Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@crascit.com>
Date: Sat, 9 Apr 2022 21:44:50 +1000
Subject: [PATCH 24/35] CheckSourceCompiles: Avoid linker warning with
 -fembed-bitcode

When the Apple linker sees -headerpad_max_install_names and
bitcode is enabled with a flag like -fembed-bitcode, it issues a warning
and ignores the -headerpad_max_install_names flag. This causes
unrelated compiler and linker flag checks to fail for valid flags.
In f745e0497e (CheckCompilerFlags: Catch linker warning about ignored
flags, 2022-01-03), we started detecting linker warnings, which caused
a regression for projects that were setting -fembed-bitcode in their
CMAKE_CXX_FLAGS or similar. Prevent that regression by removing
the -headerpad_max_install_names linker flag when we know it will
warn and be ignored anyway.

Fixes: #23390
Issue: #23408
---
 Modules/Internal/HeaderpadWorkaround.cmake    | 69 +++++++++++++++++++
 Source/cmCoreTryCompile.cxx                   |  6 ++
 .../HeaderpadWorkaround.cmake                 | 18 +++++
 .../CheckCompilerFlag/RunCMakeTest.cmake      |  4 ++
 4 files changed, 97 insertions(+)
 create mode 100644 Modules/Internal/HeaderpadWorkaround.cmake
 create mode 100644 Tests/RunCMake/CheckCompilerFlag/HeaderpadWorkaround.cmake

diff --git a/Modules/Internal/HeaderpadWorkaround.cmake b/Modules/Internal/HeaderpadWorkaround.cmake
new file mode 100644
index 00000000000..9a7f9f57e41
--- /dev/null
+++ b/Modules/Internal/HeaderpadWorkaround.cmake
@@ -0,0 +1,69 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+
+# Do NOT include this module directly into any of your code. It is used by
+# the try_compile() implementation to work around a specific issue with
+# conflicting flags when building for Apple platforms.
+if(NOT APPLE)
+  return()
+endif()
+
+cmake_policy(PUSH)
+cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
+
+function(__cmake_internal_workaround_headerpad_flag_conflict _LANG)
+
+  # Until we can avoid hard-coding -Wl,-headerpad_max_install_names in the
+  # linker flags, we need to remove it here for cases where we know it will
+  # conflict with other flags, generate a warning and be ignored.
+  set(regex "(^| )(-fembed-bitcode(-marker|=(all|bitcode|marker))?|-bundle_bitcode)($| )")
+  set(remove_headerpad NO)
+
+  # Check arbitrary flags that the user or project has set. These compiler
+  # flags get added to the linker command line.
+  if("${CMAKE_${_LANG}_FLAGS}" MATCHES "${regex}")
+    set(remove_headerpad YES)
+  endif()
+  if(NOT remove_headerpad)
+    get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+    if(is_multi_config)
+      # Only one of these config-specific variables will be set by try_compile()
+      # and the rest will be unset, but we can't easily tell which one is set.
+      # No harm to just add them all here, empty ones won't add flags to check.
+      foreach(config IN LISTS CMAKE_CONFIGURATION_TYPES)
+        if("${CMAKE_${_LANG}_FLAGS_${config}}" MATCHES "${regex}")
+          set(remove_headerpad YES)
+          break()
+        endif()
+      endforeach()
+    else()
+      if("${CMAKE_${_LANG}_FLAGS_${CMAKE_BUILD_TYPE}}" MATCHES "${regex}")
+        set(remove_headerpad YES)
+      endif()
+    endif()
+  endif()
+
+  # The try_compile() command passes compiler flags to check in a way that
+  # results in them being added to add_definitions(). Those don't end up on
+  # the linker command line, so we don't need to check them here.
+
+  if(remove_headerpad)
+    foreach(flag IN ITEMS
+      CMAKE_${_LANG}_LINK_FLAGS
+      CMAKE_SHARED_LIBRARY_CREATE_${_LANG}_FLAGS
+      CMAKE_SHARED_MODULE_CREATE_${_LANG}_FLAGS)
+      string(REPLACE "-Wl,-headerpad_max_install_names" "" ${flag} "${${flag}}")
+      set(${flag} "${${flag}}" PARENT_SCOPE)
+    endforeach()
+  endif()
+endfunction()
+
+get_property(__enabled_languages GLOBAL PROPERTY ENABLED_LANGUAGES)
+foreach(__lang IN LISTS __enabled_languages)
+  __cmake_internal_workaround_headerpad_flag_conflict(${__lang})
+endforeach()
+unset(__lang)
+unset(__enabled_languages)
+
+cmake_policy(POP)
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index 84fa8977954..324ce87c2e4 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -831,6 +831,12 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv,
               ? "NEW"
               : "OLD");
 
+    // Workaround for -Wl,-headerpad_max_install_names issue until we can avoid
+    // adding that flag in the platform and compiler language files
+    fprintf(fout,
+            "include(\"${CMAKE_ROOT}/Modules/Internal/"
+            "HeaderpadWorkaround.cmake\")\n");
+
     if (targetType == cmStateEnums::EXECUTABLE) {
       /* Put the executable at a known location (for COPY_FILE).  */
       fprintf(fout, "set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"%s\")\n",
diff --git a/Tests/RunCMake/CheckCompilerFlag/HeaderpadWorkaround.cmake b/Tests/RunCMake/CheckCompilerFlag/HeaderpadWorkaround.cmake
new file mode 100644
index 00000000000..128f9dbf882
--- /dev/null
+++ b/Tests/RunCMake/CheckCompilerFlag/HeaderpadWorkaround.cmake
@@ -0,0 +1,18 @@
+enable_language(C)
+
+include(CheckCompilerFlag)
+
+# Confirm we can check the conflicting flag directly. This should pass with
+# or without the workaround.
+check_compiler_flag(C "-fembed-bitcode" result1)
+if(NOT result1)
+  message(FATAL_ERROR "False negative when -fembed-bitcode tested directly")
+endif()
+
+# Check conflicting flag set by user or project won't cause a false negative
+# when testing a valid flag. This only passes with the workaround.
+set(CMAKE_C_FLAGS -fembed-bitcode)
+check_compiler_flag(C "-O" result2)
+if(NOT result2)
+  message(FATAL_ERROR "False negative when -fembed-bitcode set in CMAKE_C_FLAGS")
+endif()
diff --git a/Tests/RunCMake/CheckCompilerFlag/RunCMakeTest.cmake b/Tests/RunCMake/CheckCompilerFlag/RunCMakeTest.cmake
index 7ef1860c6a8..df2b667cc0b 100644
--- a/Tests/RunCMake/CheckCompilerFlag/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CheckCompilerFlag/RunCMakeTest.cmake
@@ -26,3 +26,7 @@ endif()
 if(CMake_TEST_HIP)
   run_cmake(CheckHIPCompilerFlag)
 endif()
+
+if(APPLE)
+  run_cmake_with_options(HeaderpadWorkaround --debug-trycompile)
+endif()

From 23671318f3597c99a3aedb786e8847e71ff12d08 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 9 Apr 2022 18:56:49 +0200
Subject: [PATCH 25/35] FindPostgreSQL: add support for PostgreSQL 14

---
 Modules/FindPostgreSQL.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake
index 25c5c09fa77..2233aa05f59 100644
--- a/Modules/FindPostgreSQL.cmake
+++ b/Modules/FindPostgreSQL.cmake
@@ -53,7 +53,7 @@ is set regardless of the presence of the ``Server`` component in find_package ca
 # In Windows the default installation of PostgreSQL uses that as part of the path.
 # E.g C:\Program Files\PostgreSQL\8.4.
 # Currently, the following version numbers are known to this module:
-# "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
+# "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0"
 #
 # To use this variable just do something like this:
 # set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4")
@@ -102,7 +102,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
 
 
 set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
-    "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+    "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
 
 # Define additional search paths for root directories.
 set( PostgreSQL_ROOT_DIRECTORIES

From ab5455aa79e6f259ebad3b630869662fd6c886d1 Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@crascit.com>
Date: Sat, 9 Apr 2022 12:38:01 +1000
Subject: [PATCH 26/35] Help: Correct/add missing details for CheckPIESupported

---
 Modules/CheckPIESupported.cmake | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Modules/CheckPIESupported.cmake b/Modules/CheckPIESupported.cmake
index 64244725202..173fd61d317 100644
--- a/Modules/CheckPIESupported.cmake
+++ b/Modules/CheckPIESupported.cmake
@@ -22,10 +22,13 @@ property for executables will be honored at link time.
   Options are:
 
   ``OUTPUT_VARIABLE <output>``
-    Set ``<output>`` variable with details about any error.
+    Set ``<output>`` variable with details about any error. If the check is
+    bypassed because it uses cached results from a previous call, the output
+    will be empty even if errors were present in the previous call.
 
   ``LANGUAGES <lang>...``
     Check the linkers used for each of the specified languages.
+    If this option is not provided, the command checks all enabled languages.
 
     ``C``, ``CXX``, ``Fortran`` are supported.
 
@@ -43,9 +46,9 @@ Variables
 For each language checked, two boolean cache variables are defined.
 
  ``CMAKE_<lang>_LINK_PIE_SUPPORTED``
-   Set to ``YES`` if ``PIE`` is supported by the linker and ``NO`` otherwise.
+   Set to true if ``PIE`` is supported by the linker and false otherwise.
  ``CMAKE_<lang>_LINK_NO_PIE_SUPPORTED``
-   Set to ``YES`` if ``NO_PIE`` is supported by the linker and ``NO`` otherwise.
+   Set to true if ``NO_PIE`` is supported by the linker and false otherwise.
 
 Examples
 ^^^^^^^^

From 91c859d1e510bd1ce60fe8a105fe8d4a84392c1e Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@crascit.com>
Date: Sat, 9 Apr 2022 12:38:49 +1000
Subject: [PATCH 27/35] CheckPIESupported: Prevent separate output lines
 running together

---
 Modules/CheckPIESupported.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/CheckPIESupported.cmake b/Modules/CheckPIESupported.cmake
index 173fd61d317..452348bf9ea 100644
--- a/Modules/CheckPIESupported.cmake
+++ b/Modules/CheckPIESupported.cmake
@@ -142,7 +142,7 @@ function (check_pie_supported)
       # no support at link time. Set cache variables to NO
       set(CMAKE_${lang}_LINK_PIE_SUPPORTED NO CACHE INTERNAL "PIE (${lang})")
       set(CMAKE_${lang}_LINK_NO_PIE_SUPPORTED NO CACHE INTERNAL "NO_PIE (${lang})")
-      string (APPEND outputs "PIE and NO_PIE are not supported by linker for ${lang}")
+      string (APPEND outputs "PIE and NO_PIE are not supported by linker for ${lang}\n")
     endif()
   endforeach()
 

From 45299a8f9bd366e7f41b938dfed6df9c3d4eac0d Mon Sep 17 00:00:00 2001
From: Robert Maynard <rmaynard@nvidia.com>
Date: Mon, 11 Apr 2022 10:35:19 -0400
Subject: [PATCH 28/35] cmake: --list=presets=[type] doesn't generate incorrect
 warnings

Fixes #23407
---
 Source/cmakemain.cxx                                   |  5 +++--
 .../ListConfigurePresetsWorkingDir-stdout.txt          |  7 +++++++
 Tests/RunCMake/CMakePresets/RunCMakeTest.cmake         | 10 +++++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt

diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 0554c3e3e02..76055b4ad7d 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -306,10 +306,11 @@ int do_cmake(int ac, char const* const* av)
                        parsedArgs.emplace_back("--find-package");
                        return true;
                      } },
-    CommandArgument{ "--list-presets", CommandArgument::Values::Zero,
-                     [&](std::string const&) -> bool {
+    CommandArgument{ "--list-presets", CommandArgument::Values::ZeroOrOne,
+                     [&](std::string const& value) -> bool {
                        workingMode = cmake::HELP_MODE;
                        parsedArgs.emplace_back("--list-presets");
+                       parsedArgs.emplace_back(value);
                        return true;
                      } },
   };
diff --git a/Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt b/Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt
new file mode 100644
index 00000000000..97eedae7c6b
--- /dev/null
+++ b/Tests/RunCMake/CMakePresets/ListConfigurePresetsWorkingDir-stdout.txt
@@ -0,0 +1,7 @@
+^Not searching for unused variables given on the command line\.
+Available configure presets:
+
+  "zzzzzz"       - Sleepy
+  "aaaaaaaa"     - Screaming
+  "mmmmmm"
+  "no-generator"$
diff --git a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake
index 449132ab4f6..5867efd25c2 100644
--- a/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMakePresets/RunCMakeTest.cmake
@@ -71,13 +71,18 @@ function(run_cmake_presets name)
     set(_unused_cli)
   endif()
 
+  set(_preset "--preset=${name}")
+  if(CMakePresets_NO_PRESET)
+    set(_preset)
+  endif()
+
   set(RunCMake_TEST_COMMAND ${CMAKE_COMMAND}
     ${_source_args}
     -DRunCMake_TEST=${name}
     -DRunCMake_GENERATOR=${RunCMake_GENERATOR}
     -DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}
     ${_unused_cli}
-    --preset=${name}
+    ${_preset}
     ${ARGN}
     )
   run_cmake(${name})
@@ -288,7 +293,10 @@ run_cmake_presets(ListPresets --list-presets)
 set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/ListPresetsWorkingDir")
 set(RunCMake_TEST_NO_CLEAN 1)
 set(CMakePresets_NO_SOURCE_ARGS 1)
+set(CMakePresets_NO_PRESET 1)
 run_cmake_presets(ListPresetsWorkingDir --list-presets)
+run_cmake_presets(ListConfigurePresetsWorkingDir --list-presets=configure)
+unset(CMakePresets_NO_PRESET)
 unset(CMakePresets_NO_SOURCE_ARGS)
 unset(RunCMake_TEST_NO_CLEAN)
 unset(RunCMake_TEST_BINARY_DIR)

From 05783b168d47c2062817d58cb0a905dd6893cf8b Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 7 Apr 2022 16:49:07 -0400
Subject: [PATCH 29/35] cmFileSet: store visibility with the fileset

The visibility is intrinsic to the fileset, so store it with it. This
avoids recalculating it on every addition to the fileset.
---
 Source/cmFileSet.cxx              | 62 ++++++++++++++++++++++++++++++-
 Source/cmFileSet.h                | 21 ++++++++++-
 Source/cmTarget.cxx               |  6 +--
 Source/cmTarget.h                 |  5 ++-
 Source/cmTargetSourcesCommand.cxx | 43 +++++----------------
 5 files changed, 97 insertions(+), 40 deletions(-)

diff --git a/Source/cmFileSet.cxx b/Source/cmFileSet.cxx
index 2c06dc6f679..1d1d29e4473 100644
--- a/Source/cmFileSet.cxx
+++ b/Source/cmFileSet.cxx
@@ -7,19 +7,79 @@
 #include <utility>
 #include <vector>
 
+#include <cmext/string_view>
+
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmGeneratorExpression.h"
 #include "cmListFileCache.h"
 #include "cmLocalGenerator.h"
+#include "cmMakefile.h"
 #include "cmMessageType.h"
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"
 #include "cmake.h"
 
-cmFileSet::cmFileSet(std::string name, std::string type)
+cm::static_string_view cmFileSetVisibilityToName(cmFileSetVisibility vis)
+{
+  switch (vis) {
+    case cmFileSetVisibility::Interface:
+      return "INTERFACE"_s;
+    case cmFileSetVisibility::Public:
+      return "PUBLIC"_s;
+    case cmFileSetVisibility::Private:
+      return "PRIVATE"_s;
+  }
+  return ""_s;
+}
+
+cmFileSetVisibility cmFileSetVisibilityFromName(cm::string_view name,
+                                                cmMakefile* mf)
+{
+  if (name == "INTERFACE"_s) {
+    return cmFileSetVisibility::Interface;
+  }
+  if (name == "PUBLIC"_s) {
+    return cmFileSetVisibility::Public;
+  }
+  if (name == "PRIVATE"_s) {
+    return cmFileSetVisibility::Private;
+  }
+  mf->IssueMessage(
+    MessageType::FATAL_ERROR,
+    cmStrCat("File set visibility \"", name, "\" is not valid."));
+  return cmFileSetVisibility::Private;
+}
+
+bool cmFileSetVisibilityIsForSelf(cmFileSetVisibility vis)
+{
+  switch (vis) {
+    case cmFileSetVisibility::Interface:
+      return false;
+    case cmFileSetVisibility::Public:
+    case cmFileSetVisibility::Private:
+      return true;
+  }
+  return false;
+}
+
+bool cmFileSetVisibilityIsForInterface(cmFileSetVisibility vis)
+{
+  switch (vis) {
+    case cmFileSetVisibility::Interface:
+    case cmFileSetVisibility::Public:
+      return true;
+    case cmFileSetVisibility::Private:
+      return false;
+  }
+  return false;
+}
+
+cmFileSet::cmFileSet(std::string name, std::string type,
+                     cmFileSetVisibility visibility)
   : Name(std::move(name))
   , Type(std::move(type))
+  , Visibility(visibility)
 {
 }
 
diff --git a/Source/cmFileSet.h b/Source/cmFileSet.h
index 3aad75f9fd0..5357e77e701 100644
--- a/Source/cmFileSet.h
+++ b/Source/cmFileSet.h
@@ -7,20 +7,38 @@
 #include <string>
 #include <vector>
 
+#include <cm/string_view>
+#include <cmext/string_view>
+
 #include "cmListFileCache.h"
 
 class cmCompiledGeneratorExpression;
 struct cmGeneratorExpressionDAGChecker;
 class cmGeneratorTarget;
 class cmLocalGenerator;
+class cmMakefile;
+
+enum class cmFileSetVisibility
+{
+  Private,
+  Public,
+  Interface,
+};
+cm::static_string_view cmFileSetVisibilityToName(cmFileSetVisibility vis);
+cmFileSetVisibility cmFileSetVisibilityFromName(cm::string_view name,
+                                                cmMakefile* mf);
+bool cmFileSetVisibilityIsForSelf(cmFileSetVisibility vis);
+bool cmFileSetVisibilityIsForInterface(cmFileSetVisibility vis);
 
 class cmFileSet
 {
 public:
-  cmFileSet(std::string name, std::string type);
+  cmFileSet(std::string name, std::string type,
+            cmFileSetVisibility visibility);
 
   const std::string& GetName() const { return this->Name; }
   const std::string& GetType() const { return this->Type; }
+  cmFileSetVisibility GetVisibility() const { return this->Visibility; }
 
   void ClearDirectoryEntries();
   void AddDirectoryEntry(BT<std::string> directories);
@@ -61,6 +79,7 @@ class cmFileSet
 private:
   std::string Name;
   std::string Type;
+  cmFileSetVisibility Visibility;
   std::vector<BT<std::string>> DirectoryEntries;
   std::vector<BT<std::string>> FileEntries;
 };
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index e1a966772cb..3bcc4a47f01 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2342,10 +2342,10 @@ cmFileSet* cmTarget::GetFileSet(const std::string& name)
 }
 
 std::pair<cmFileSet*, bool> cmTarget::GetOrCreateFileSet(
-  const std::string& name, const std::string& type)
+  const std::string& name, const std::string& type, cmFileSetVisibility vis)
 {
-  auto result =
-    this->impl->FileSets.emplace(std::make_pair(name, cmFileSet(name, type)));
+  auto result = this->impl->FileSets.emplace(
+    std::make_pair(name, cmFileSet(name, type, vis)));
   return std::make_pair(&result.first->second, result.second);
 }
 
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 1bbd0b0dfa2..36238549670 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "cmAlgorithms.h"
+#include "cmFileSet.h"
 #include "cmPolicies.h"
 #include "cmStateTypes.h"
 #include "cmStringAlgorithms.h"
@@ -19,7 +20,6 @@
 #include "cmValue.h"
 
 class cmCustomCommand;
-class cmFileSet;
 class cmGlobalGenerator;
 class cmInstallTargetGenerator;
 class cmListFileBacktrace;
@@ -285,7 +285,8 @@ class cmTarget
   const cmFileSet* GetFileSet(const std::string& name) const;
   cmFileSet* GetFileSet(const std::string& name);
   std::pair<cmFileSet*, bool> GetOrCreateFileSet(const std::string& name,
-                                                 const std::string& type);
+                                                 const std::string& type,
+                                                 cmFileSetVisibility vis);
 
   std::vector<std::string> GetAllInterfaceFileSets() const;
 
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx
index 9173a34a3fa..bf57cc7683f 100644
--- a/Source/cmTargetSourcesCommand.cxx
+++ b/Source/cmTargetSourcesCommand.cxx
@@ -2,7 +2,6 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmTargetSourcesCommand.h"
 
-#include <algorithm>
 #include <sstream>
 #include <utility>
 
@@ -239,7 +238,11 @@ bool TargetSourcesImpl::HandleOneFileSet(
     (args.Type.empty() && args.FileSet[0] >= 'A' && args.FileSet[0] <= 'Z');
   std::string type = isDefault ? args.FileSet : args.Type;
 
-  auto fileSet = this->Target->GetOrCreateFileSet(args.FileSet, type);
+  cmFileSetVisibility visibility =
+    cmFileSetVisibilityFromName(scope, this->Makefile);
+
+  auto fileSet =
+    this->Target->GetOrCreateFileSet(args.FileSet, type, visibility);
   if (fileSet.second) {
     if (!isDefault) {
       if (!cmFileSet::IsValidName(args.FileSet)) {
@@ -279,37 +282,11 @@ bool TargetSourcesImpl::HandleOneFileSet(
       return false;
     }
 
-    std::string existingScope = "PRIVATE";
-
-    auto const fileSetsProperty = cmTarget::GetFileSetsPropertyName(type);
-    auto const interfaceFileSetsProperty =
-      cmTarget::GetInterfaceFileSetsPropertyName(type);
-    std::vector<std::string> fileSets;
-    std::vector<std::string> interfaceFileSets;
-    cmExpandList(this->Target->GetSafeProperty(fileSetsProperty), fileSets);
-    cmExpandList(this->Target->GetSafeProperty(interfaceFileSetsProperty),
-                 interfaceFileSets);
-
-    if (std::find(interfaceFileSets.begin(), interfaceFileSets.end(),
-                  args.FileSet) != interfaceFileSets.end()) {
-      existingScope = "INTERFACE";
-    }
-    if (std::find(fileSets.begin(), fileSets.end(), args.FileSet) !=
-        fileSets.end()) {
-      if (existingScope == "INTERFACE"_s) {
-        existingScope = "PUBLIC";
-      }
-    } else if (existingScope != "INTERFACE"_s) {
-      this->SetError(cmStrCat("File set \"", args.FileSet, "\" is not in ",
-                              fileSetsProperty, " or ",
-                              interfaceFileSetsProperty));
-      return false;
-    }
-
-    if (scope != existingScope) {
+    if (visibility != fileSet.first->GetVisibility()) {
       this->SetError(
         cmStrCat("Scope ", scope, " for file set \"", args.FileSet,
-                 "\" does not match original scope ", existingScope));
+                 "\" does not match original scope ",
+                 cmFileSetVisibilityToName(fileSet.first->GetVisibility())));
       return false;
     }
   }
@@ -330,11 +307,11 @@ bool TargetSourcesImpl::HandleOneFileSet(
       for (auto const& dir : cmExpandedList(baseDirectories)) {
         auto interfaceDirectoriesGenex =
           cmStrCat("$<BUILD_INTERFACE:", dir, ">");
-        if (scope == "PRIVATE"_s || scope == "PUBLIC"_s) {
+        if (cmFileSetVisibilityIsForSelf(visibility)) {
           this->Target->AppendProperty("INCLUDE_DIRECTORIES",
                                        interfaceDirectoriesGenex);
         }
-        if (scope == "INTERFACE"_s || scope == "PUBLIC"_s) {
+        if (cmFileSetVisibilityIsForInterface(visibility)) {
           this->Target->AppendProperty("INTERFACE_INCLUDE_DIRECTORIES",
                                        interfaceDirectoriesGenex);
         }

From c5d4812f20b61982494c11412190f040a6178be6 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Mon, 11 Apr 2022 14:06:15 -0400
Subject: [PATCH 30/35] cmTarget: make HEADER_SETS and INTERFACE_HEADER_SETS
 read-only

There is no reason to allow these properties to be manipulated by user
code. Instead, use the stored visibility on the fileset objects to
derive what these properties should contain.
---
 Help/prop_tgt/HEADER_SETS.rst                 | 12 +--
 Help/prop_tgt/INTERFACE_HEADER_SETS.rst       |  7 +-
 Help/release/3.23.rst                         |  4 +-
 Source/cmTarget.cxx                           | 91 ++++++++-----------
 Source/cmTargetSourcesCommand.cxx             |  9 --
 .../target_sources/FileSetImport.cmake        |  4 +-
 .../FileSetNoExistInterface-stderr.txt        |  4 -
 .../FileSetNoExistPrivate-stderr.txt          |  4 -
 .../FileSetNoExistPrivate.cmake               |  7 --
 .../target_sources/FileSetNoScope-result.txt  |  1 -
 .../target_sources/FileSetNoScope-stderr.txt  |  4 -
 .../target_sources/FileSetNoScope.cmake       |  6 --
 .../target_sources/FileSetProperties.cmake    |  4 +-
 ...xt => FileSetReadOnlyInterface-result.txt} |  0
 .../FileSetReadOnlyInterface-stderr.txt       |  5 +
 ...e.cmake => FileSetReadOnlyInterface.cmake} |  3 -
 ....txt => FileSetReadOnlyPrivate-result.txt} |  0
 .../FileSetReadOnlyPrivate-stderr.txt         |  5 +
 .../FileSetReadOnlyPrivate.cmake              |  4 +
 .../target_sources/RunCMakeTest.cmake         |  5 +-
 20 files changed, 67 insertions(+), 112 deletions(-)
 delete mode 100644 Tests/RunCMake/target_sources/FileSetNoExistInterface-stderr.txt
 delete mode 100644 Tests/RunCMake/target_sources/FileSetNoExistPrivate-stderr.txt
 delete mode 100644 Tests/RunCMake/target_sources/FileSetNoExistPrivate.cmake
 delete mode 100644 Tests/RunCMake/target_sources/FileSetNoScope-result.txt
 delete mode 100644 Tests/RunCMake/target_sources/FileSetNoScope-stderr.txt
 delete mode 100644 Tests/RunCMake/target_sources/FileSetNoScope.cmake
 rename Tests/RunCMake/target_sources/{FileSetNoExistInterface-result.txt => FileSetReadOnlyInterface-result.txt} (100%)
 create mode 100644 Tests/RunCMake/target_sources/FileSetReadOnlyInterface-stderr.txt
 rename Tests/RunCMake/target_sources/{FileSetNoExistInterface.cmake => FileSetReadOnlyInterface.cmake} (50%)
 rename Tests/RunCMake/target_sources/{FileSetNoExistPrivate-result.txt => FileSetReadOnlyPrivate-result.txt} (100%)
 create mode 100644 Tests/RunCMake/target_sources/FileSetReadOnlyPrivate-stderr.txt
 create mode 100644 Tests/RunCMake/target_sources/FileSetReadOnlyPrivate.cmake

diff --git a/Help/prop_tgt/HEADER_SETS.rst b/Help/prop_tgt/HEADER_SETS.rst
index fcf723e4191..eaec79f021a 100644
--- a/Help/prop_tgt/HEADER_SETS.rst
+++ b/Help/prop_tgt/HEADER_SETS.rst
@@ -3,14 +3,10 @@ HEADER_SETS
 
 .. versionadded:: 3.23
 
-List of the target's ``PRIVATE`` and ``PUBLIC`` header sets (i.e. all
-file sets with the type ``HEADERS``). Files listed in these file sets
-are treated as source files for the purpose of IDE integration.
-The files also have their :prop_sf:`HEADER_FILE_ONLY` property set to
-``TRUE``.
-
-This property is normally only set by :command:`target_sources(FILE_SET)`
-rather than being manipulated directly.
+Read-only list of the target's ``PRIVATE`` and ``PUBLIC`` header sets (i.e.
+all file sets with the type ``HEADERS``). Files listed in these file sets are
+treated as source files for the purpose of IDE integration. The files also
+have their :prop_sf:`HEADER_FILE_ONLY` property set to ``TRUE``.
 
 See also :prop_tgt:`HEADER_SET_<NAME>`, :prop_tgt:`HEADER_SET` and
 :prop_tgt:`INTERFACE_HEADER_SETS`.
diff --git a/Help/prop_tgt/INTERFACE_HEADER_SETS.rst b/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
index 62db5b30447..498dc31641a 100644
--- a/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
+++ b/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
@@ -3,12 +3,9 @@ INTERFACE_HEADER_SETS
 
 .. versionadded:: 3.23
 
-List of the target's ``INTERFACE`` and ``PUBLIC`` header sets (i.e. all
-file sets with the type ``HEADERS``). Files listed in these header sets
+Read-only list of the target's ``INTERFACE`` and ``PUBLIC`` header sets (i.e.
+all file sets with the type ``HEADERS``). Files listed in these header sets
 can be installed with :command:`install(TARGETS)` and exported with
 :command:`install(EXPORT)` and :command:`export`.
 
-This property is normally only set by :command:`target_sources(FILE_SET)`
-rather than being manipulated directly.
-
 See also :prop_tgt:`HEADER_SETS`.
diff --git a/Help/release/3.23.rst b/Help/release/3.23.rst
index 257c3d54487..97b0920de96 100644
--- a/Help/release/3.23.rst
+++ b/Help/release/3.23.rst
@@ -114,8 +114,8 @@ Variables
 Properties
 ----------
 
-* The :prop_tgt:`HEADER_SETS` and :prop_tgt:`INTERFACE_HEADER_SETS` target
-  properties were added to list header sets associated with a target.
+* The :prop_tgt:`HEADER_SETS` and :prop_tgt:`INTERFACE_HEADER_SETS` read-only
+  target properties were added to list header sets associated with a target.
 
 * The :prop_tgt:`HEADER_SET` and :prop_tgt:`HEADER_SET_<NAME>` target
   properties were added to list files in the default header set
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3bcc4a47f01..57e31b9497a 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1456,37 +1456,14 @@ void cmTarget::StoreProperty(const std::string& prop, ValueType value)
         BT<std::string>(value, this->impl->Makefile->GetBacktrace()));
     }
   } else if (prop == propHEADER_SETS) {
-    if (value) {
-      for (auto const& name : cmExpandedList(value)) {
-        if (!this->GetFileSet(name)) {
-          this->impl->Makefile->IssueMessage(
-            MessageType::FATAL_ERROR,
-            cmStrCat("Header set \"", name, "\" has not yet been created."));
-          return;
-        }
-      }
-    }
-    this->impl->HeaderSetsEntries.clear();
-    if (!StringIsEmpty(value)) {
-      this->impl->HeaderSetsEntries.emplace_back(
-        value, this->impl->Makefile->GetBacktrace());
-    }
+    this->impl->Makefile->IssueMessage(MessageType::FATAL_ERROR,
+                                       "HEADER_SETS property is read-only\n");
+    return;
   } else if (prop == propINTERFACE_HEADER_SETS) {
-    if (value) {
-      for (auto const& name : cmExpandedList(value)) {
-        if (!this->GetFileSet(name)) {
-          this->impl->Makefile->IssueMessage(
-            MessageType::FATAL_ERROR,
-            cmStrCat("Header set \"", name, "\" has not yet been created."));
-          return;
-        }
-      }
-    }
-    this->impl->InterfaceHeaderSetsEntries.clear();
-    if (!StringIsEmpty(value)) {
-      this->impl->InterfaceHeaderSetsEntries.emplace_back(
-        value, this->impl->Makefile->GetBacktrace());
-    }
+    this->impl->Makefile->IssueMessage(
+      MessageType::FATAL_ERROR,
+      "INTERFACE_HEADER_SETS property is read-only\n");
+    return;
   } else {
     this->impl->Properties.SetProperty(prop, value);
   }
@@ -1641,27 +1618,14 @@ void cmTarget::AppendProperty(const std::string& prop,
     fileSet->AddFileEntry(
       BT<std::string>(value, this->impl->Makefile->GetBacktrace()));
   } else if (prop == "HEADER_SETS") {
-    for (auto const& name : cmExpandedList(value)) {
-      if (!this->GetFileSet(name)) {
-        this->impl->Makefile->IssueMessage(
-          MessageType::FATAL_ERROR,
-          cmStrCat("Header set \"", name, "\" has not yet been created."));
-        return;
-      }
-    }
-    this->impl->HeaderSetsEntries.emplace_back(
-      value, this->impl->Makefile->GetBacktrace());
+    this->impl->Makefile->IssueMessage(MessageType::FATAL_ERROR,
+                                       "HEADER_SETS property is read-only\n");
+    return;
   } else if (prop == "INTERFACE_HEADER_SETS") {
-    for (auto const& name : cmExpandedList(value)) {
-      if (!this->GetFileSet(name)) {
-        this->impl->Makefile->IssueMessage(
-          MessageType::FATAL_ERROR,
-          cmStrCat("Header set \"", name, "\" has not yet been created."));
-        return;
-      }
-    }
-    this->impl->InterfaceHeaderSetsEntries.emplace_back(
-      value, this->impl->Makefile->GetBacktrace());
+    this->impl->Makefile->IssueMessage(
+      MessageType::FATAL_ERROR,
+      "INTERFACE_HEADER_SETS property is read-only\n");
+    return;
   } else {
     this->impl->Properties.AppendProperty(prop, value, asString);
   }
@@ -2038,13 +2002,26 @@ cmValue cmTarget::GetProperty(const std::string& prop) const
       return cmValue(output);
     }
     if (prop == propHEADER_SETS) {
+      std::vector<std::string> set_names;
+      for (auto const& file_set : this->impl->FileSets) {
+        if (cmFileSetVisibilityIsForSelf(file_set.second.GetVisibility())) {
+          set_names.push_back(file_set.second.GetName());
+        }
+      }
       static std::string output;
-      output = cmJoin(this->impl->HeaderSetsEntries, ";"_s);
+      output = cmJoin(set_names, ";"_s);
       return cmValue(output);
     }
     if (prop == propINTERFACE_HEADER_SETS) {
+      std::vector<std::string> set_names;
+      for (auto const& file_set : this->impl->FileSets) {
+        if (cmFileSetVisibilityIsForInterface(
+              file_set.second.GetVisibility())) {
+          set_names.push_back(file_set.second.GetName());
+        }
+      }
       static std::string output;
-      output = cmJoin(this->impl->InterfaceHeaderSetsEntries, ";"_s);
+      output = cmJoin(set_names, ";"_s);
       return cmValue(output);
     }
   }
@@ -2346,6 +2323,16 @@ std::pair<cmFileSet*, bool> cmTarget::GetOrCreateFileSet(
 {
   auto result = this->impl->FileSets.emplace(
     std::make_pair(name, cmFileSet(name, type, vis)));
+  if (result.second) {
+    if (cmFileSetVisibilityIsForSelf(vis)) {
+      this->impl->HeaderSetsEntries.emplace_back(
+        name, this->impl->Makefile->GetBacktrace());
+    }
+    if (cmFileSetVisibilityIsForInterface(vis)) {
+      this->impl->InterfaceHeaderSetsEntries.emplace_back(
+        name, this->impl->Makefile->GetBacktrace());
+    }
+  }
   return std::make_pair(&result.first->second, result.second);
 }
 
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx
index bf57cc7683f..b1367e18487 100644
--- a/Source/cmTargetSourcesCommand.cxx
+++ b/Source/cmTargetSourcesCommand.cxx
@@ -264,15 +264,6 @@ bool TargetSourcesImpl::HandleOneFileSet(
     if (args.BaseDirs.empty()) {
       args.BaseDirs.emplace_back(this->Makefile->GetCurrentSourceDirectory());
     }
-
-    if (scope == "PRIVATE"_s || scope == "PUBLIC"_s) {
-      this->Target->AppendProperty(cmTarget::GetFileSetsPropertyName(type),
-                                   args.FileSet);
-    }
-    if (scope == "INTERFACE"_s || scope == "PUBLIC"_s) {
-      this->Target->AppendProperty(
-        cmTarget::GetInterfaceFileSetsPropertyName(type), args.FileSet);
-    }
   } else {
     type = fileSet.first->GetType();
     if (!args.Type.empty() && args.Type != type) {
diff --git a/Tests/RunCMake/target_sources/FileSetImport.cmake b/Tests/RunCMake/target_sources/FileSetImport.cmake
index 9c7358a305d..7e790c71061 100644
--- a/Tests/RunCMake/target_sources/FileSetImport.cmake
+++ b/Tests/RunCMake/target_sources/FileSetImport.cmake
@@ -17,7 +17,7 @@ include("${export_build_dir}/export.cmake")
 include("${export_build_dir}/install/lib/cmake/export.cmake")
 
 assert_prop_eq(export::lib1 HEADER_SETS "")
-assert_prop_eq(export::lib1 INTERFACE_HEADER_SETS "HEADERS;b;c;d;e;f;g;dir3")
+assert_prop_eq(export::lib1 INTERFACE_HEADER_SETS "HEADERS;b;c;d;dir3;e;f;g")
 assert_prop_eq(export::lib1 HEADER_SET "${CMAKE_CURRENT_SOURCE_DIR}/error.c")
 assert_prop_eq(export::lib1 HEADER_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
 assert_prop_eq(export::lib1 HEADER_SET_b "${CMAKE_CURRENT_SOURCE_DIR}/h2.h")
@@ -35,7 +35,7 @@ assert_prop_eq(export::lib1 HEADER_DIRS_g "${CMAKE_CURRENT_SOURCE_DIR}/dir1;${CM
 assert_prop_eq(export::lib1 INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR};$<1:${CMAKE_CURRENT_SOURCE_DIR}/dir>;${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/$<IF:$<CONFIG:Debug>,debug,release>;${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/dir1;${CMAKE_CURRENT_SOURCE_DIR}/dir2;${CMAKE_CURRENT_SOURCE_DIR}/dir3;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>;$<BUILD_INTERFACE:$<1:${CMAKE_CURRENT_SOURCE_DIR}/dir>>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/$<IF:$<CONFIG:Debug>,debug,release>>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dir1>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dir2>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dir3>")
 
 assert_prop_eq(install::lib1 HEADER_SETS "")
-assert_prop_eq(install::lib1 INTERFACE_HEADER_SETS "HEADERS;b;c;d;e;f;g;dir3")
+assert_prop_eq(install::lib1 INTERFACE_HEADER_SETS "HEADERS;b;c;d;dir3;e;f;g")
 assert_prop_eq(install::lib1 HEADER_SET "${export_build_dir}/install/include/error.c")
 assert_prop_eq(install::lib1 HEADER_DIRS "${export_build_dir}/install/include")
 assert_prop_eq(install::lib1 HEADER_SET_b "${export_build_dir}/install/include/h2.h")
diff --git a/Tests/RunCMake/target_sources/FileSetNoExistInterface-stderr.txt b/Tests/RunCMake/target_sources/FileSetNoExistInterface-stderr.txt
deleted file mode 100644
index 3972c89efe1..00000000000
--- a/Tests/RunCMake/target_sources/FileSetNoExistInterface-stderr.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-^CMake Error at FileSetNoExistInterface\.cmake:[0-9]+ \(set_property\):
-  Header set "a" has not yet been created\.
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/target_sources/FileSetNoExistPrivate-stderr.txt b/Tests/RunCMake/target_sources/FileSetNoExistPrivate-stderr.txt
deleted file mode 100644
index 336bafe00cd..00000000000
--- a/Tests/RunCMake/target_sources/FileSetNoExistPrivate-stderr.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-^CMake Error at FileSetNoExistPrivate\.cmake:[0-9]+ \(set_property\):
-  Header set "a" has not yet been created\.
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/target_sources/FileSetNoExistPrivate.cmake b/Tests/RunCMake/target_sources/FileSetNoExistPrivate.cmake
deleted file mode 100644
index f501912d1c8..00000000000
--- a/Tests/RunCMake/target_sources/FileSetNoExistPrivate.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-enable_language(C)
-
-add_library(lib1 STATIC empty.c)
-set_property(TARGET lib1 PROPERTY HEADER_SETS "a")
-
-# Error happens at configure-time, so this doesn't help.
-target_sources(lib1 PRIVATE FILE_SET a TYPE HEADERS)
diff --git a/Tests/RunCMake/target_sources/FileSetNoScope-result.txt b/Tests/RunCMake/target_sources/FileSetNoScope-result.txt
deleted file mode 100644
index d00491fd7e5..00000000000
--- a/Tests/RunCMake/target_sources/FileSetNoScope-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/target_sources/FileSetNoScope-stderr.txt b/Tests/RunCMake/target_sources/FileSetNoScope-stderr.txt
deleted file mode 100644
index 835ffe7b5fb..00000000000
--- a/Tests/RunCMake/target_sources/FileSetNoScope-stderr.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-^CMake Error at FileSetNoScope\.cmake:[0-9]+ \(target_sources\):
-  target_sources File set "a" is not in HEADER_SETS or INTERFACE_HEADER_SETS
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/target_sources/FileSetNoScope.cmake b/Tests/RunCMake/target_sources/FileSetNoScope.cmake
deleted file mode 100644
index 79ff341500c..00000000000
--- a/Tests/RunCMake/target_sources/FileSetNoScope.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-enable_language(C)
-
-add_library(lib1 STATIC empty.c)
-target_sources(lib1 PRIVATE FILE_SET a TYPE HEADERS BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} FILES h1.h)
-set_property(TARGET lib1 PROPERTY HEADER_SETS)
-target_sources(lib1 PRIVATE FILE_SET a TYPE HEADERS FILES h2.h)
diff --git a/Tests/RunCMake/target_sources/FileSetProperties.cmake b/Tests/RunCMake/target_sources/FileSetProperties.cmake
index a671ab34ed1..74487fe9081 100644
--- a/Tests/RunCMake/target_sources/FileSetProperties.cmake
+++ b/Tests/RunCMake/target_sources/FileSetProperties.cmake
@@ -57,14 +57,14 @@ assert_prop_eq(lib1 INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
 assert_prop_eq(lib1 INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/.>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
 
 target_sources(lib1 PUBLIC FILE_SET HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}" FILES h1.h)
-assert_prop_eq(lib1 INTERFACE_HEADER_SETS "a;c;d;HEADERS")
+assert_prop_eq(lib1 INTERFACE_HEADER_SETS "HEADERS;a;c;d")
 assert_prop_eq(lib1 HEADER_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
 assert_prop_eq(lib1 HEADER_SET "${CMAKE_CURRENT_SOURCE_DIR}/h1.h")
 assert_prop_eq(lib1 INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/.>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dir>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
 assert_prop_eq(lib1 INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/.>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
 
 target_sources(lib1 PUBLIC FILE_SET HEADERS FILES h2.h)
-assert_prop_eq(lib1 INTERFACE_HEADER_SETS "a;c;d;HEADERS")
+assert_prop_eq(lib1 INTERFACE_HEADER_SETS "HEADERS;a;c;d")
 assert_prop_eq(lib1 HEADER_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
 assert_prop_eq(lib1 HEADER_SET "${CMAKE_CURRENT_SOURCE_DIR}/h1.h;${CMAKE_CURRENT_SOURCE_DIR}/h2.h")
 assert_prop_eq(lib1 INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/.>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dir>;$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>")
diff --git a/Tests/RunCMake/target_sources/FileSetNoExistInterface-result.txt b/Tests/RunCMake/target_sources/FileSetReadOnlyInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/target_sources/FileSetNoExistInterface-result.txt
rename to Tests/RunCMake/target_sources/FileSetReadOnlyInterface-result.txt
diff --git a/Tests/RunCMake/target_sources/FileSetReadOnlyInterface-stderr.txt b/Tests/RunCMake/target_sources/FileSetReadOnlyInterface-stderr.txt
new file mode 100644
index 00000000000..2307d132afa
--- /dev/null
+++ b/Tests/RunCMake/target_sources/FileSetReadOnlyInterface-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Error at FileSetReadOnlyInterface\.cmake:[0-9]+ \(set_property\):
+  INTERFACE_HEADER_SETS property is read-only
+
+Call Stack \(most recent call first\):
+  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/target_sources/FileSetNoExistInterface.cmake b/Tests/RunCMake/target_sources/FileSetReadOnlyInterface.cmake
similarity index 50%
rename from Tests/RunCMake/target_sources/FileSetNoExistInterface.cmake
rename to Tests/RunCMake/target_sources/FileSetReadOnlyInterface.cmake
index 266bc6161e5..468ef912a9e 100644
--- a/Tests/RunCMake/target_sources/FileSetNoExistInterface.cmake
+++ b/Tests/RunCMake/target_sources/FileSetReadOnlyInterface.cmake
@@ -2,6 +2,3 @@ enable_language(C)
 
 add_library(lib1 STATIC empty.c)
 set_property(TARGET lib1 PROPERTY INTERFACE_HEADER_SETS "a")
-
-# Error happens at configure-time, so this doesn't help.
-target_sources(lib1 INTERFACE FILE_SET a TYPE HEADERS)
diff --git a/Tests/RunCMake/target_sources/FileSetNoExistPrivate-result.txt b/Tests/RunCMake/target_sources/FileSetReadOnlyPrivate-result.txt
similarity index 100%
rename from Tests/RunCMake/target_sources/FileSetNoExistPrivate-result.txt
rename to Tests/RunCMake/target_sources/FileSetReadOnlyPrivate-result.txt
diff --git a/Tests/RunCMake/target_sources/FileSetReadOnlyPrivate-stderr.txt b/Tests/RunCMake/target_sources/FileSetReadOnlyPrivate-stderr.txt
new file mode 100644
index 00000000000..5f955da5055
--- /dev/null
+++ b/Tests/RunCMake/target_sources/FileSetReadOnlyPrivate-stderr.txt
@@ -0,0 +1,5 @@
+^CMake Error at FileSetReadOnlyPrivate\.cmake:[0-9]+ \(set_property\):
+  HEADER_SETS property is read-only
+
+Call Stack \(most recent call first\):
+  CMakeLists\.txt:[0-9]+ \(include\)$
diff --git a/Tests/RunCMake/target_sources/FileSetReadOnlyPrivate.cmake b/Tests/RunCMake/target_sources/FileSetReadOnlyPrivate.cmake
new file mode 100644
index 00000000000..eda92c16bc0
--- /dev/null
+++ b/Tests/RunCMake/target_sources/FileSetReadOnlyPrivate.cmake
@@ -0,0 +1,4 @@
+enable_language(C)
+
+add_library(lib1 STATIC empty.c)
+set_property(TARGET lib1 PROPERTY HEADER_SETS "a")
diff --git a/Tests/RunCMake/target_sources/RunCMakeTest.cmake b/Tests/RunCMake/target_sources/RunCMakeTest.cmake
index 743879e7c3b..8429c967b49 100644
--- a/Tests/RunCMake/target_sources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/target_sources/RunCMakeTest.cmake
@@ -33,9 +33,8 @@ run_cmake(FileSetWrongBaseDirsRelative)
 run_cmake(FileSetOverlappingBaseDirs)
 run_cmake(FileSetInstallMissingSetsPrivate)
 run_cmake(FileSetInstallMissingSetsInterface)
-run_cmake(FileSetNoScope)
-run_cmake(FileSetNoExistPrivate)
-run_cmake(FileSetNoExistInterface)
+run_cmake(FileSetReadOnlyPrivate)
+run_cmake(FileSetReadOnlyInterface)
 run_cmake(FileSetNoExistInstall)
 run_cmake(FileSetDirectories)
 run_cmake(FileSetCustomTarget)

From fcf1fcfd0c7eb360c26ff389649ee00380d30d15 Mon Sep 17 00:00:00 2001
From: Gregor Jasny <gjasny@googlemail.com>
Date: Sun, 3 Apr 2022 21:58:22 +0200
Subject: [PATCH 31/35] Tests: Ignore all classes in Xcode internal objc
 warnings

Xcode on Apple Silicon warns not only about AMSupportURL classes
but also many more.
---
 Tests/RunCMake/RunCMake.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 3363a579e0a..5e66a521ec0 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -157,7 +157,7 @@ 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]*warning: file type[^\n]*is based on missing file type"
-    "|[^\n]*objc[^\n]*: Class AMSupportURL[^\n]* One of the two will be used. Which one is undefined."
+    "|[^\n]*objc[^\n]*: Class [^\n]* One of the two will be used. Which one is undefined."
     "|[^\n]*is a member of multiple groups"
     "|[^\n]*offset in archive not a multiple of 8"
     "|[^\n]*from Time Machine by path"

From 476c6a89109d9737715c74bf3458628b665c4c8d Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@gmail.com>
Date: Mon, 11 Apr 2022 10:50:22 -0700
Subject: [PATCH 32/35] PCH: Fix Xcode non-pch language exclusion

Fix a regression caused by commit bbcdac4e5d (PCH: Fix all-language
precompile header support in Xcode, 2021-08-07, v3.22.0-rc1~140^2).

Fixes: #23138
---
 Source/cmLocalGenerator.cxx                     | 10 ++++++----
 .../PchIncludedOneLanguage.cmake                | 17 +++++++++++++++++
 .../PrecompileHeaders/RunCMakeTest.cmake        |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index fc5e6e5f183..feea49f40f0 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2510,12 +2510,12 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target)
     static const std::array<std::string, 4> langs = { { "C", "CXX", "OBJC",
                                                         "OBJCXX" } };
 
-    bool haveAnyPch = false;
+    std::set<std::string> pchLangSet;
     if (this->GetGlobalGenerator()->IsXcode()) {
       for (const std::string& lang : langs) {
         const std::string pchHeader = target->GetPchHeader(config, lang, "");
         if (!pchHeader.empty()) {
-          haveAnyPch = true;
+          pchLangSet.emplace(lang);
         }
       }
     }
@@ -2560,9 +2560,11 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target)
         const std::string pchHeader = target->GetPchHeader(config, lang, arch);
 
         if (pchSource.empty() || pchHeader.empty()) {
-          if (this->GetGlobalGenerator()->IsXcode() && haveAnyPch) {
+          if (this->GetGlobalGenerator()->IsXcode() && !pchLangSet.empty()) {
             for (auto* sf : sources) {
-              sf->SetProperty("SKIP_PRECOMPILE_HEADERS", "ON");
+              if (pchLangSet.find(sf->GetLanguage()) == pchLangSet.end()) {
+                sf->SetProperty("SKIP_PRECOMPILE_HEADERS", "ON");
+              }
             }
           }
           continue;
diff --git a/Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake b/Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake
new file mode 100644
index 00000000000..dd582aca8cb
--- /dev/null
+++ b/Tests/RunCMake/PrecompileHeaders/PchIncludedOneLanguage.cmake
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.16)
+project(PchIncludedAllLanguages C CXX)
+
+if(CMAKE_CXX_COMPILE_OPTIONS_USE_PCH)
+  add_definitions(-DHAVE_PCH_SUPPORT)
+endif()
+
+add_executable(main
+  main.cpp
+  empty.c
+  pch-included.cpp
+)
+
+target_precompile_headers(main PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${CMAKE_CURRENT_SOURCE_DIR}/pch.h>)
+
+enable_testing()
+add_test(NAME main COMMAND main)
diff --git a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake b/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake
index ca5b52e87ce..29611aee9b3 100644
--- a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake
+++ b/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake
@@ -29,4 +29,5 @@ if(RunCMake_GENERATOR MATCHES "Make|Ninja")
 endif()
 run_test(PchReuseFromObjLib)
 run_test(PchIncludedAllLanguages)
+run_test(PchIncludedOneLanguage)
 run_test(PchLibObjLibExe)

From 5fa15ec9f34d69b2a6b1ce08a6102f16c5d7ab9b Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 12 Apr 2022 08:47:45 -0400
Subject: [PATCH 33/35] Help: Document that target_sources defines
 [INTERFACE_]HEADER_SETS

---
 Help/prop_tgt/HEADER_SETS.rst           | 3 +++
 Help/prop_tgt/INTERFACE_HEADER_SETS.rst | 3 +++
 Help/release/3.23.rst                   | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/Help/prop_tgt/HEADER_SETS.rst b/Help/prop_tgt/HEADER_SETS.rst
index eaec79f021a..ceb1df50620 100644
--- a/Help/prop_tgt/HEADER_SETS.rst
+++ b/Help/prop_tgt/HEADER_SETS.rst
@@ -8,5 +8,8 @@ all file sets with the type ``HEADERS``). Files listed in these file sets are
 treated as source files for the purpose of IDE integration. The files also
 have their :prop_sf:`HEADER_FILE_ONLY` property set to ``TRUE``.
 
+Header sets may be defined using the :command:`target_sources` command
+``FILE_SET`` option with type ``HEADERS``.
+
 See also :prop_tgt:`HEADER_SET_<NAME>`, :prop_tgt:`HEADER_SET` and
 :prop_tgt:`INTERFACE_HEADER_SETS`.
diff --git a/Help/prop_tgt/INTERFACE_HEADER_SETS.rst b/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
index 498dc31641a..2d3bdacfcf0 100644
--- a/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
+++ b/Help/prop_tgt/INTERFACE_HEADER_SETS.rst
@@ -8,4 +8,7 @@ all file sets with the type ``HEADERS``). Files listed in these header sets
 can be installed with :command:`install(TARGETS)` and exported with
 :command:`install(EXPORT)` and :command:`export`.
 
+Header sets may be defined using the :command:`target_sources` command
+``FILE_SET`` option with type ``HEADERS``.
+
 See also :prop_tgt:`HEADER_SETS`.
diff --git a/Help/release/3.23.rst b/Help/release/3.23.rst
index 97b0920de96..2febbec3cb4 100644
--- a/Help/release/3.23.rst
+++ b/Help/release/3.23.rst
@@ -278,3 +278,7 @@ Changes made since CMake 3.23.0 include the following.
   targets.  Pending further work in a future version of CMake, it is now
   an error to add a ``FILE_SET`` of type ``HEADERS`` to such targets on
   Apple platforms.
+
+* The :prop_tgt:`HEADER_SETS` and :prop_tgt:`INTERFACE_HEADER_SETS` target
+  properties added in CMake 3.23.0 are now read-only records of the header
+  sets created by the :command:`target_sources` command.

From 07d351b535dde56a89aa6786a3f0701e3b159d44 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 12 Apr 2022 09:05:05 -0400
Subject: [PATCH 34/35] CMake 3.22.4

---
 Help/release/3.22.rst     | 13 ++++++++++---
 Source/CMakeVersion.cmake |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Help/release/3.22.rst b/Help/release/3.22.rst
index efac925f29c..00e93f62a91 100644
--- a/Help/release/3.22.rst
+++ b/Help/release/3.22.rst
@@ -151,9 +151,9 @@ Changes made since CMake 3.22.0 include the following.
 3.22.1
 ------
 
-This version made no changes to documented features or interfaces.
-Some implementation updates were made to support ecosystem changes
-and/or fix regressions.
+* This version made no changes to documented features or interfaces.
+  Some implementation updates were made to support ecosystem changes
+  and/or fix regressions.
 
 3.22.2
 ------
@@ -169,3 +169,10 @@ and/or fix regressions.
   errors in existing projects.  The fix has been reverted to restore
   compatibility.  The fix may be restored in a future version of CMake
   via a policy.
+
+3.22.4
+------
+
+* 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/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index b592abf7eab..b1fecbd9aa4 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 22)
-set(CMake_VERSION_PATCH 3)
+set(CMake_VERSION_PATCH 4)
 #set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 

From efe08e289466683b0945a5396f6848064dec5ae0 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Tue, 12 Apr 2022 10:06:39 -0400
Subject: [PATCH 35/35] CMake 3.23.1

---
 Source/CMakeVersion.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 22100e33781..19359d8ee3c 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 23)
-set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_PATCH 1)
 #set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)