mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-12 10:10:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'doc-project-include-vars-3.29'

Browse Source 
dcb894fb00 Help: Update project() code injection for new 3.29 include behavior
09cf39ab07 Help: Improve wording of CMAKE_PROJECT_..._INCLUDE... changes for 3.29

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9343
This commit is contained in:
Brad King
2024-03-18 17:59:37 +00:00
committed by Kitware Robot
parent c61bbf48c5 dcb894fb00
commit e3a8a6fc0c
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Help/command/project.rst
View File

@@ -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 ``<PROJECT-NAME>`` as its project
name, include the file named by
name, include the file(s) and module(s) named by
:variable:`CMAKE_PROJECT_<PROJECT-NAME>_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 ``<PROJECT-NAME>`` as its project
name, include the file named by
name, include the file(s) and module(s) named by
:variable:`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE`, if set.
Usage

3
Help/variable/CMAKE_PROJECT_INCLUDE.rst
View File

@@ -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 <CMake Language Lists>`
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_<PROJECT-NAME>_INCLUDE`,
:variable:`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE`,

3
Help/variable/CMAKE_PROJECT_INCLUDE_BEFORE.rst
View File

@@ -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 <CMake Language Lists>`
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_<PROJECT-NAME>_INCLUDE`,
:variable:`CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE`,

3
Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
View File

@@ -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 <CMake Language Lists>`
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_<PROJECT-NAME>_INCLUDE_BEFORE`,
:variable:`CMAKE_PROJECT_INCLUDE`, :variable:`CMAKE_PROJECT_INCLUDE_BEFORE`,

3
Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE_BEFORE.rst
View File

@@ -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 <CMake Language Lists>`
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_<PROJECT-NAME>_INCLUDE`,
:variable:`CMAKE_PROJECT_INCLUDE`, :variable:`CMAKE_PROJECT_INCLUDE_BEFORE`,