summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-03-23 13:34:35 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-03-23 13:34:41 (GMT)
commit6baef6784dfbc259e61d6e6b556cb4fed84080e8 (patch)
tree9898a732fe0fdcc4b3d1f5abb656253b8ae41f2e
parent3b1efedc400f5b93467b4479edf5b3aec4bfa562 (diff)
parent7dc654a0178ce1c1dfc10bcd5309c641d38d42bd (diff)
downloadCMake-6baef6784dfbc259e61d6e6b556cb4fed84080e8.zip
CMake-6baef6784dfbc259e61d6e6b556cb4fed84080e8.tar.gz
CMake-6baef6784dfbc259e61d6e6b556cb4fed84080e8.tar.bz2
Merge topic 'better_cross-ref_CMAKE_FIND_NO_INSTALL_PREFIX' into release-3.23
7dc654a017 Help: Better cross-reference CMAKE_FIND_NO_INSTALL_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7097
-rw-r--r--Help/variable/CMAKE_INSTALL_PREFIX.rst4
-rw-r--r--Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst3
2 files changed, 5 insertions, 2 deletions
diff --git a/Help/variable/CMAKE_INSTALL_PREFIX.rst b/Help/variable/CMAKE_INSTALL_PREFIX.rst
index b92d3ef..6d42ea8 100644
--- a/Help/variable/CMAKE_INSTALL_PREFIX.rst
+++ b/Help/variable/CMAKE_INSTALL_PREFIX.rst
@@ -16,7 +16,9 @@ variable for more information.
The installation prefix is also added to :variable:`CMAKE_SYSTEM_PREFIX_PATH`
so that :command:`find_package`, :command:`find_program`,
:command:`find_library`, :command:`find_path`, and :command:`find_file`
-will search the prefix for other software.
+will search the prefix for other software. This behavior can be disabled by
+setting the :variable:`CMAKE_FIND_NO_INSTALL_PREFIX` to ``TRUE`` before the
+first :command:`project` invocation.
.. note::
diff --git a/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst b/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
index 81a7a0b..c8b5815 100644
--- a/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
+++ b/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
@@ -11,7 +11,8 @@ documentation.
By default this contains the system directories for the current system, the
:variable:`CMAKE_INSTALL_PREFIX`, and the :variable:`CMAKE_STAGING_PREFIX`.
The installation and staging prefixes may be excluded by setting
-the :variable:`CMAKE_FIND_NO_INSTALL_PREFIX` variable.
+the :variable:`CMAKE_FIND_NO_INSTALL_PREFIX` variable before the
+first :command:`project` invocation.
The system directories that are contained in ``CMAKE_SYSTEM_PREFIX_PATH`` are
locations that typically include installed software. An example being