From 09cf39ab07d772783a82a41817df93b6fc54b057 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sat, 16 Mar 2024 17:42:10 +1100 Subject: Help: Improve wording of CMAKE_PROJECT_..._INCLUDE... changes for 3.29 --- Help/variable/CMAKE_PROJECT_INCLUDE.rst | 3 ++- Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst | 3 ++- Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst | 3 ++- Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.rst | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Help/variable/CMAKE_PROJECT_INCLUDE.rst b/Help/variable/CMAKE_PROJECT_INCLUDE.rst index 217604f..e3b07d0 100644 --- a/Help/variable/CMAKE_PROJECT_INCLUDE.rst +++ b/Help/variable/CMAKE_PROJECT_INCLUDE.rst @@ -12,7 +12,8 @@ for a more detailed discussion of files potentially included during a .. versionadded:: 3.29 This variable can be a :ref:`semicolon-separated list ` of CMake language files to be included sequentially. It can also now refer to - module names to be found in :variable:`CMAKE_MODULE_PATH` or builtin to CMake. + module names to be found in :variable:`CMAKE_MODULE_PATH` or as a builtin + CMake module. See also the :variable:`CMAKE_PROJECT__INCLUDE`, :variable:`CMAKE_PROJECT__INCLUDE_BEFORE`, diff --git a/Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst b/Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst index 1dc0241..48da906 100644 --- a/Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst +++ b/Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst @@ -12,7 +12,8 @@ for a more detailed discussion of files potentially included during a .. versionadded:: 3.29 This variable can be a :ref:`semicolon-separated list ` of CMake language files to be included sequentially. It can also now refer to - module names to be found in :variable:`CMAKE_MODULE_PATH` or builtin to CMake. + module names to be found in :variable:`CMAKE_MODULE_PATH` or as a builtin + CMake module. See also the :variable:`CMAKE_PROJECT__INCLUDE`, :variable:`CMAKE_PROJECT__INCLUDE_BEFORE`, diff --git a/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst b/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst index 6d37c1a..7e2e1bb 100644 --- a/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst +++ b/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst @@ -10,7 +10,8 @@ discussion of files potentially included during a :command:`project` call. .. versionadded:: 3.29 This variable can be a :ref:`semicolon-separated list ` of CMake language files to be included sequentially. It can also now refer to - module names to be found in :variable:`CMAKE_MODULE_PATH` or builtin to CMake. + module names to be found in :variable:`CMAKE_MODULE_PATH` or as a builtin + CMake module. See also the :variable:`CMAKE_PROJECT__INCLUDE_BEFORE`, :variable:`CMAKE_PROJECT_INCLUDE`, :variable:`CMAKE_PROJECT_INCLUDE_BEFORE`, diff --git a/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.rst b/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.rst index 96ddbf6..59ac1b0 100644 --- a/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.rst +++ b/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.rst @@ -12,7 +12,8 @@ discussion of files potentially included during a :command:`project` call. .. versionadded:: 3.29 This variable can be a :ref:`semicolon-separated list ` of CMake language files to be included sequentially. It can also now refer to - module names to be found in :variable:`CMAKE_MODULE_PATH` or builtin to CMake. + module names to be found in :variable:`CMAKE_MODULE_PATH` or as a builtin + CMake module. See also the :variable:`CMAKE_PROJECT__INCLUDE`, :variable:`CMAKE_PROJECT_INCLUDE`, :variable:`CMAKE_PROJECT_INCLUDE_BEFORE`, -- cgit v0.12 From dcb894fb00d4279c429934e1909f5d5d11741f9e Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Sat, 16 Mar 2024 17:43:25 +1100 Subject: Help: Update project() code injection for new 3.29 include behavior Specifically, the various CMAKE_PROJECT_...INCLUDE... variables can now take a list of things, and those things can be module names too, not just file names. --- Help/command/project.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Help/command/project.rst b/Help/command/project.rst index d695789..2b93880 100644 --- a/Help/command/project.rst +++ b/Help/command/project.rst @@ -123,12 +123,12 @@ The following outlines the steps performed during a ``project()`` call: * .. versionadded:: 3.15 For every ``project()`` call regardless of the project - name, include the file named by :variable:`CMAKE_PROJECT_INCLUDE_BEFORE`, - if set. + name, include the file(s) and module(s) named by + :variable:`CMAKE_PROJECT_INCLUDE_BEFORE`, if set. * .. versionadded:: 3.17 If the ``project()`` command specifies ```` as its project - name, include the file named by + name, include the file(s) and module(s) named by :variable:`CMAKE_PROJECT__INCLUDE_BEFORE`, if set. * Set the various project-specific variables detailed in the `Synopsis`_ @@ -156,11 +156,11 @@ The following outlines the steps performed during a ``project()`` call: * .. versionadded:: 3.15 For every ``project()`` call regardless of the project - name, include the file named by :variable:`CMAKE_PROJECT_INCLUDE`, - if set. + name, include the file(s) and module(s) named by + :variable:`CMAKE_PROJECT_INCLUDE`, if set. * If the ``project()`` command specifies ```` as its project - name, include the file named by + name, include the file(s) and module(s) named by :variable:`CMAKE_PROJECT__INCLUDE`, if set. Usage -- cgit v0.12