This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 36516f0a504e586c0b31f64ad373cf355dfc1a88 (commit)
via 8db410f33620859474f272a82d1c8895538d66e2 (commit)
via d9dd7cca66d005ca82ba8d3166207ca595cb1fce (commit)
via a0a7a45dbcc17000a5cb8223e86908f41c40faf5 (commit)
via 049dbdd38c56ad9ea06af2032faf3348c3c76742 (commit)
from cffff0f17ef14fae6652ea5fd8c3511123a8e7b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36516f0a504e586c0b31f64ad373cf355dfc1a88
commit 36516f0a504e586c0b31f64ad373cf355dfc1a88
Merge: 8db410f336 d9dd7cca66
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 29 14:33:20 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Oct 29 10:34:17 2019 -0400
Merge topic 'swift-parallel-jobs'
d9dd7cca66 Swift: correct flags for parallel jobs
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3950
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8db410f33620859474f272a82d1c8895538d66e2
commit 8db410f33620859474f272a82d1c8895538d66e2
Merge: cffff0f17e a0a7a45dbc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Oct 29 14:32:55 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Oct 29 10:33:16 2019 -0400
Merge topic 'docs-find-vars'
a0a7a45dbc Help: Fix markup errors, improve wording of CMAKE_FIND...
variable docs
049dbdd38c Help: Document that <PackageName>_ROOT applies to config
packages too
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3952
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9dd7cca66d005ca82ba8d3166207ca595cb1fce
commit d9dd7cca66d005ca82ba8d3166207ca595cb1fce
Author: Saleem Abdulrasool <compn...@compnerd.org>
AuthorDate: Sat Oct 26 18:11:08 2019 -0700
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Oct 28 11:36:57 2019 -0400
Swift: correct flags for parallel jobs
`-num-threads` is for the threading, not the job control. Use `-j` to
launch the parallel jobs. This enables parallel builds for Swift again
after driver updates preventing the parallelization through
`-num-threads`.
diff --git a/Modules/CMakeSwiftInformation.cmake
b/Modules/CMakeSwiftInformation.cmake
index 4f1d4f0cd8..69d3900797 100644
--- a/Modules/CMakeSwiftInformation.cmake
+++ b/Modules/CMakeSwiftInformation.cmake
@@ -72,7 +72,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
endif()
if(NOT CMAKE_Swift_CREATE_SHARED_LIBRARY)
- set(CMAKE_Swift_CREATE_SHARED_LIBRARY "<CMAKE_Swift_COMPILER>
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads
${CMAKE_Swift_NUM_THREADS} -emit-library -o <TARGET> -module-name
<SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module
-emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS>
<INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <SONAME_FLAG> <TARGET_SONAME>
${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_SHARED_LIBRARY "<CMAKE_Swift_COMPILER>
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -j
${CMAKE_Swift_NUM_THREADS} -emit-library -o <TARGET> -module-name
<SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module
-emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS>
<INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <SONAME_FLAG> <TARGET_SONAME>
${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>")
endif()
if(NOT CMAKE_Swift_CREATE_SHARED_MODULE)
@@ -80,11 +80,11 @@ if(NOT CMAKE_Swift_CREATE_SHARED_MODULE)
endif()
if(NOT CMAKE_Swift_LINK_EXECUTABLE)
- set(CMAKE_Swift_LINK_EXECUTABLE "<CMAKE_Swift_COMPILER> -output-file-map
<SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads ${CMAKE_Swift_NUM_THREADS}
-emit-executable -o <TARGET> -emit-module -emit-module-path <SWIFT_MODULE>
-emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS>
${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>")
+ set(CMAKE_Swift_LINK_EXECUTABLE "<CMAKE_Swift_COMPILER> -output-file-map
<SWIFT_OUTPUT_FILE_MAP> -incremental -j ${CMAKE_Swift_NUM_THREADS}
-emit-executable -o <TARGET> -emit-module -emit-module-path <SWIFT_MODULE>
-emit-dependencies <DEFINES> <FLAGS> <INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS>
${CMAKE_Swift_IMPLIB_LINKER_FLAGS} <LINK_LIBRARIES>")
endif()
if(NOT CMAKE_Swift_CREATE_STATIC_LIBRARY)
- set(CMAKE_Swift_CREATE_STATIC_LIBRARY "<CMAKE_Swift_COMPILER>
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -num-threads
${CMAKE_Swift_NUM_THREADS} -emit-library -static -o <TARGET> -module-name
<SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module
-emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS>
<INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
+ set(CMAKE_Swift_CREATE_STATIC_LIBRARY "<CMAKE_Swift_COMPILER>
-output-file-map <SWIFT_OUTPUT_FILE_MAP> -incremental -j
${CMAKE_Swift_NUM_THREADS} -emit-library -static -o <TARGET> -module-name
<SWIFT_MODULE_NAME> -module-link-name <SWIFT_LIBRARY_NAME> -emit-module
-emit-module-path <SWIFT_MODULE> -emit-dependencies <DEFINES> <FLAGS>
<INCLUDES> <SWIFT_SOURCES> <LINK_FLAGS> <LINK_LIBRARIES>")
set(CMAKE_Swift_ARCHIVE_CREATE "<CMAKE_AR> crs <TARGET> <OBJECTS>")
set(CMAKE_Swift_ARCHIVE_FINISH "")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0a7a45dbcc17000a5cb8223e86908f41c40faf5
commit a0a7a45dbcc17000a5cb8223e86908f41c40faf5
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Sun Oct 27 16:11:55 2019 +1100
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Sun Oct 27 18:11:00 2019 +1100
Help: Fix markup errors, improve wording of CMAKE_FIND... variable docs
diff --git a/Help/release/3.16.rst b/Help/release/3.16.rst
index 7992f2dbcf..570f536cdc 100644
--- a/Help/release/3.16.rst
+++ b/Help/release/3.16.rst
@@ -75,28 +75,27 @@ Commands
* The :command:`find_file`, :command:`find_library`, :command:`find_path`,
:command:`find_package`, and :command:`find_program` commands have learned to
- check the following variables to control searching
+ check the following variables to control the default behavior for groups of
+ search locations:
- * :variable:`CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH` - Controls the searching
- the cmake-specific environment variables.
+ * :variable:`CMAKE_FIND_USE_PACKAGE_ROOT_PATH` - Controls the default
+ behavior of searching the :variable:`<PackageName>_ROOT` variables.
- * :variable:`CMAKE_FIND_USE_CMAKE_PATH` - Controls the searching the
- cmake-specific cache variables.
+ * :variable:`CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH` - Controls the default
+ behavior of searching the CMake-specific environment variables.
- * :variable:`CMAKE_FIND_USE_CMAKE_SYSTEM_PATH` - Controls the searching
- cmake platform specific variables.
+ * :variable:`CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH` - Controls the default
+ behavior of searching the standard system environment variables.
- * :variable:`CMAKE_FIND_USE_PACKAGE_ROOT_PATH` - Controls the searching of
- :variable:`<PackageName>_ROOT` variables.
+ * :variable:`CMAKE_FIND_USE_CMAKE_PATH` - Controls the default behavior of
+ searching the CMake-specific cache variables.
- * :variable:`CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH` - Controls the searching
- the standard system environment variables.
+ * :variable:`CMAKE_FIND_USE_CMAKE_SYSTEM_PATH` - Controls the default
+ behavior of searching the platform-specific CMake variables.
-* The :command:`find_package` command has learned to check the following
- variables to control searching
-
- * :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` - Controls the searching the
- cmake user registry.
+* The :command:`find_package` command has learned to check the
+ :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` variable to control the default
+ behavior of searching the CMake user package registry.
* The :command:`message` command learned indentation control with the new
:variable:`CMAKE_MESSAGE_INDENT` variable.
diff --git a/Help/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst
b/Help/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst
index ffb8a2c5e8..4ee9d8b815 100644
--- a/Help/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst
+++ b/Help/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst
@@ -8,8 +8,8 @@ CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY
By default this variable is not set. If neither
:variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` nor
``CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY`` is set, then
-:command:`find_package()` will use the `User Package Registry` unless the
-`NO_CMAKE_PACKAGE_REGISTRY` option is provided.
+:command:`find_package()` will use the :ref:`User Package Registry`
+unless the ``NO_CMAKE_PACKAGE_REGISTRY`` option is provided.
``CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY`` is ignored if
:variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY` is set.
diff --git a/Help/variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst
b/Help/variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst
index 2db508196f..9ebf672e1b 100644
--- a/Help/variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst
+++ b/Help/variable/CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst
@@ -1,15 +1,20 @@
CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH
-------------------------------------
-Controls the searching the cmake-specific environment variables by the
-:command:`find_program`, :command:`find_library`, :command:`find_file`,
-:command:`find_path`, and command:`find_package` commands.
+Controls the default behavior of the following commands for whether or not to
+search paths provided by cmake-specific environment variables:
+
+* :command:`find_program`
+* :command:`find_library`
+* :command:`find_file`
+* :command:`find_path`
+* :command:`find_package`
+
This is useful in cross-compiling environments.
By default this variable is not set, which is equivalent to it having
-a value of ``TRUE``. Explicit options given to the :command:`find_program`,
-:command:`find_library`, :command:`find_file`, and :command:`find_path`
-commands take precedence over this variable.
+a value of ``TRUE``. Explicit options given to the above commands
+take precedence over this variable.
See also the :variable:`CMAKE_FIND_USE_CMAKE_PATH`,
:variable:`CMAKE_FIND_USE_CMAKE_SYSTEM_PATH`,
diff --git a/Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst
b/Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst
index 4ca7ad10d8..62ae3cbdbb 100644
--- a/Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst
+++ b/Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst
@@ -1,15 +1,20 @@
CMAKE_FIND_USE_CMAKE_PATH
-------------------------
-Controls the searching the cmake-specific cache variables by the
-:command:`find_program`, :command:`find_library`, :command:`find_file`,
-:command:`find_path`, and command:`find_package` commands.
+Controls the default behavior of the following commands for whether or not to
+search paths provided by cmake-specific cache variables:
+
+* :command:`find_program`
+* :command:`find_library`
+* :command:`find_file`
+* :command:`find_path`
+* :command:`find_package`
+
This is useful in cross-compiling environments.
By default this variable is not set, which is equivalent to it having
-a value of ``TRUE``. Explicit options given to the :command:`find_program`,
-:command:`find_library`, :command:`find_file`, and :command:`find_path`
-commands take precedence over this variable.
+a value of ``TRUE``. Explicit options given to the above commands
+take precedence over this variable.
See also the :variable:`CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH`,
:variable:`CMAKE_FIND_USE_CMAKE_SYSTEM_PATH`,
diff --git a/Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst
b/Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst
index d3259aedcd..b484a6ab4e 100644
--- a/Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst
+++ b/Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst
@@ -1,15 +1,20 @@
CMAKE_FIND_USE_CMAKE_SYSTEM_PATH
--------------------------------
-Controls the searching cmake platform specific variables by the
-:command:`find_program`, :command:`find_library`, :command:`find_file`,
-:command:`find_path`, and command:`find_package` commands.
+Controls the default behavior of the following commands for whether or not to
+search paths provided by platform-specific cmake variables:
+
+* :command:`find_program`
+* :command:`find_library`
+* :command:`find_file`
+* :command:`find_path`
+* :command:`find_package`
+
This is useful in cross-compiling environments.
By default this variable is not set, which is equivalent to it having
-a value of ``TRUE``. Explicit options given to the :command:`find_program`,
-:command:`find_library`, :command:`find_file`, and :command:`find_path`
-commands take precedence over this variable.
+a value of ``TRUE``. Explicit options given to the above commands
+take precedence over this variable.
See also the :variable:`CMAKE_FIND_USE_CMAKE_PATH`,
:variable:`CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH`,
diff --git a/Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst
b/Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst
index 75e910f200..a9c8469647 100644
--- a/Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst
+++ b/Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst
@@ -1,28 +1,28 @@
CMAKE_FIND_USE_PACKAGE_REGISTRY
-------------------------------
-Controls the searching the :ref:`User Package Registry` by the
:command:`find_package`
-command.
+Controls the default behavior of the :command:`find_package` command for
+whether or not to search paths provided by the :ref:`User Package Registry`.
By default this variable is not set and the behavior will fall back
-to that determined by the deprecated
:variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY`
-variable. If that is also not set, then `find_package()` will use the
-`User Package Registry` unless the `NO_CMAKE_PACKAGE_REGISTRY` option
+to that determined by the deprecated
+:variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` variable. If that is
+also not set, then :command:`find_package` will use the
+:ref:`User Package Registry` unless the ``NO_CMAKE_PACKAGE_REGISTRY`` option
is provided.
-This variable takes precedence over
:variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY`
-when both are set.
+This variable takes precedence over
+:variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY` when both are set.
In some cases, for example to locate only system wide installations, it
is not desirable to use the :ref:`User Package Registry` when searching
-for packages. If the :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY`
+for packages. If the :variable:`CMAKE_FIND_USE_PACKAGE_REGISTRY`
variable is ``FALSE``, all the :command:`find_package` commands will skip
the :ref:`User Package Registry` as if they were called with the
``NO_CMAKE_PACKAGE_REGISTRY`` argument.
-See also :ref:`Disabling the Package Registry`.
-
-See also the :variable:`CMAKE_FIND_USE_CMAKE_PATH`,
+See also :ref:`Disabling the Package Registry` and the
+:variable:`CMAKE_FIND_USE_CMAKE_PATH`,
:variable:`CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH`,
:variable:`CMAKE_FIND_USE_CMAKE_SYSTEM_PATH`,
:variable:`CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`,
diff --git a/Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst
b/Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst
index e17fdccc8f..25a25f3ba0 100644
--- a/Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst
+++ b/Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst
@@ -1,15 +1,18 @@
CMAKE_FIND_USE_PACKAGE_ROOT_PATH
--------------------------------
-Controls the searching of :variable:`<PackageName>_ROOT` variables by the
-:command:`find_program`, :command:`find_library`, :command:`find_file`,
-:command:`find_path`, and command:`find_package` commands.
-This is useful in cross-compiling environments.
+Controls the default behavior of the following commands for whether or not to
+search paths provided by :variable:`<PackageName>_ROOT` variables:
+
+* :command:`find_program`
+* :command:`find_library`
+* :command:`find_file`
+* :command:`find_path`
+* :command:`find_package`
By default this variable is not set, which is equivalent to it having
-a value of ``TRUE``. Explicit options given to the :command:`find_program`,
-:command:`find_library`, :command:`find_file`, and :command:`find_path`
-commands take precedence over this variable.
+a value of ``TRUE``. Explicit options given to the above commands
+take precedence over this variable.
See also the :variable:`CMAKE_FIND_USE_CMAKE_PATH`,
:variable:`CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH`,
diff --git a/Help/variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst
b/Help/variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst
index 71432f66fd..0713709b7f 100644
--- a/Help/variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst
+++ b/Help/variable/CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst
@@ -1,15 +1,20 @@
CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH
--------------------------------------
-Controls the searching the standard system environment variables by the
-:command:`find_program`, :command:`find_library`, :command:`find_file`,
-:command:`find_path`, and command:`find_package` commands.
+Controls the default behavior of the following commands for whether or not to
+search paths provided by standard system environment variables:
+
+* :command:`find_program`
+* :command:`find_library`
+* :command:`find_file`
+* :command:`find_path`
+* :command:`find_package`
+
This is useful in cross-compiling environments.
By default this variable is not set, which is equivalent to it having
-a value of ``TRUE``. Explicit options given to the :command:`find_program`,
-:command:`find_library`, :command:`find_file`, and :command:`find_path`
-commands take precedence over this variable.
+a value of ``TRUE``. Explicit options given to the above commands
+take precedence over this variable.
See also the :variable:`CMAKE_FIND_USE_CMAKE_PATH`,
:variable:`CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH`,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=049dbdd38c56ad9ea06af2032faf3348c3c76742
commit 049dbdd38c56ad9ea06af2032faf3348c3c76742
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Sun Oct 27 16:10:09 2019 +1100
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Sun Oct 27 16:10:09 2019 +1100
Help: Document that <PackageName>_ROOT applies to config packages too
The original intent of <PackageName>_ROOT may have been for it
to apply only to Find modules, but the implementation of the
find_package() command treats modules and config packages the
same. Both result in a <PackageName>_ROOT variable being
pushed onto the stack of package roots. A config package can
also call other find_...() commands, the behavior doesn't apply
just to find modules.
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt
index 40f1c1a87b..42bf52b086 100644
--- a/Help/command/FIND_XXX.txt
+++ b/Help/command/FIND_XXX.txt
@@ -79,15 +79,16 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process
is as follows:
|prefix_XXX_SUBDIR| for each ``<prefix>`` in
:variable:`CMAKE_SYSTEM_PREFIX_PATH`
-1. If called from within a find module loaded by
+1. If called from within a find module or any other script loaded by a call to
:command:`find_package(<PackageName>)`, search prefixes unique to the
- current package being found. Specifically look in the
+ current package being found. Specifically, look in the
:variable:`<PackageName>_ROOT` CMake variable and the
:envvar:`<PackageName>_ROOT` environment variable.
- The package root variables are maintained as a stack so if called from
- nested find modules, root paths from the parent's find module will be
- searched after paths from the current module,
- i.e. ``<CurrentPackage>_ROOT``, ``ENV{<CurrentPackage>_ROOT}``,
+ The package root variables are maintained as a stack, so if called from
+ nested find modules or config packages, root paths from the parent's find
+ module or config package will be searched after paths from the current
+ module or package. In other words, the search order would be
+ ``<CurrentPackage>_ROOT``, ``ENV{<CurrentPackage>_ROOT}``,
``<ParentPackage>_ROOT``, ``ENV{<ParentPackage>_ROOT}``, etc.
This can be skipped if ``NO_PACKAGE_ROOT_PATH`` is passed or by setting
the :variable:`CMAKE_FIND_USE_PACKAGE_ROOT_PATH` to ``FALSE``.
diff --git a/Help/policy/CMP0074.rst b/Help/policy/CMP0074.rst
index 896936b212..63ebf7b434 100644
--- a/Help/policy/CMP0074.rst
+++ b/Help/policy/CMP0074.rst
@@ -7,9 +7,9 @@ In CMake 3.12 and above the
:command:`find_package(<PackageName>)` command now
searches prefixes specified by the :variable:`<PackageName>_ROOT` CMake
variable and the :envvar:`<PackageName>_ROOT` environment variable.
Package roots are maintained as a stack so nested calls to all ``find_*``
-commands inside find modules also search the roots as prefixes. This policy
-provides compatibility with projects that have not been updated to avoid using
-``<PackageName>_ROOT`` variables for other purposes.
+commands inside find modules and config packages also search the roots as
+prefixes. This policy provides compatibility with projects that have not been
+updated to avoid using ``<PackageName>_ROOT`` variables for other purposes.
The ``OLD`` behavior for this policy is to ignore ``<PackageName>_ROOT``
variables. The ``NEW`` behavior for this policy is to use
-----------------------------------------------------------------------
Summary of changes:
Help/command/FIND_XXX.txt | 13 ++++-----
Help/policy/CMP0074.rst | 6 ++---
Help/release/3.16.rst | 31 +++++++++++-----------
.../CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY.rst | 4 +--
.../CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH.rst | 17 +++++++-----
Help/variable/CMAKE_FIND_USE_CMAKE_PATH.rst | 17 +++++++-----
Help/variable/CMAKE_FIND_USE_CMAKE_SYSTEM_PATH.rst | 17 +++++++-----
Help/variable/CMAKE_FIND_USE_PACKAGE_REGISTRY.rst | 22 +++++++--------
Help/variable/CMAKE_FIND_USE_PACKAGE_ROOT_PATH.rst | 17 +++++++-----
.../CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH.rst | 17 +++++++-----
Modules/CMakeSwiftInformation.cmake | 6 ++---
11 files changed, 95 insertions(+), 72 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
