[Cmake-commits] CMake branch, next, updated. v3.4.1-1948-g1ead8ce
Brad King
brad.king at kitware.com
Wed Jan 13 09:39:21 EST 2016
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, next has been updated
via 1ead8ced6b1e6132923a6da0a410b005bb48a694 (commit)
via a777600248ea0f71581fcdfac2664b26b0f56376 (commit)
from 646f594fcee5e5ac073a72754a9c067d75bb9bcb (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=1ead8ced6b1e6132923a6da0a410b005bb48a694
commit 1ead8ced6b1e6132923a6da0a410b005bb48a694
Merge: 646f594 a777600
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 13 09:39:20 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 13 09:39:20 2016 -0500
Merge topic 'allow-variables-for-find-defaults' into next
a7776002 Revert "find_*: Add variables to enable NO_XXX_PATH defaults to find commands"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a777600248ea0f71581fcdfac2664b26b0f56376
commit a777600248ea0f71581fcdfac2664b26b0f56376
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 13 09:38:58 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 13 09:38:58 2016 -0500
Revert "find_*: Add variables to enable NO_XXX_PATH defaults to find commands"
This reverts commit 7f6ba8cd74bd5030916247049c6259293ad668a9. It will
be revised and restored later.
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt
index 7078c8c..bd4d295 100644
--- a/Help/command/FIND_XXX.txt
+++ b/Help/command/FIND_XXX.txt
@@ -56,9 +56,8 @@ Options include:
``DOC``
Specify the documentation string for the ``<VAR>`` cache entry.
-If ``NO_DEFAULT_PATH`` is specified or if
-:variable:`CMAKE_FIND_NO_DEFAULT_PATH` is set and contains ``ALL`` or
-|CMAKE_PATH_NAME|, then no additional paths are added to the search.
+If ``NO_DEFAULT_PATH`` is specified, then no additional paths are
+added to the search.
If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
.. |CMAKE_PREFIX_PATH_XXX_SUBDIR| replace::
@@ -74,9 +73,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
1. Search paths specified in cmake-specific cache variables.
These are intended to be used on the command line with a ``-DVAR=value``.
- This can be skipped if ``NO_CMAKE_PATH`` is passed or if
- :variable:`CMAKE_FIND_NO_CMAKE_PATH` is set and contains ``ALL`` or
- |CMAKE_PATH_NAME|.
+ This can be skipped if ``NO_CMAKE_PATH`` is passed.
* |CMAKE_PREFIX_PATH_XXX|
* |CMAKE_XXX_PATH|
@@ -84,9 +81,7 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
2. Search paths specified in cmake-specific environment variables.
These are intended to be set in the user's shell configuration.
- This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed or if
- :variable:`CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH` is set and contains
- ``ALL`` or |CMAKE_PATH_NAME|.
+ This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed.
* |CMAKE_PREFIX_PATH_XXX|
* |CMAKE_XXX_PATH|
@@ -98,16 +93,13 @@ If ``NO_DEFAULT_PATH`` is not specified, the search process is as follows:
Hard-coded guesses should be specified with the ``PATHS`` option.
4. Search the standard system environment variables.
- This can be skipped if ``NO_SYSTEM_ENVIRONMENT_PATH`` is an argument or if
- :variable:`CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH` is set and contains
- ``ALL`` or |CMAKE_PATH_NAME|
+ This can be skipped if ``NO_SYSTEM_ENVIRONMENT_PATH`` is an argument.
* |SYSTEM_ENVIRONMENT_PATH_XXX|
5. Search cmake variables defined in the Platform files
for the current system. This can be skipped if ``NO_CMAKE_SYSTEM_PATH``
- is passed or if :variable:`CMAKE_FIND_NO_CMAKE_SYSTEM_PATH` is set and
- contains ``ALL`` or |CMAKE_PATH_NAME|.
+ is passed.
* |CMAKE_SYSTEM_PREFIX_PATH_XXX|
* |CMAKE_SYSTEM_XXX_PATH|
diff --git a/Help/command/find_file.rst b/Help/command/find_file.rst
index 45fc84e..bf7a919 100644
--- a/Help/command/find_file.rst
+++ b/Help/command/find_file.rst
@@ -30,5 +30,4 @@ find_file
.. |CMAKE_FIND_ROOT_PATH_MODE_XXX| replace::
:variable:`CMAKE_FIND_ROOT_PATH_MODE_INCLUDE`
-.. |CMAKE_PATH_NAME| replace:: ``INCLUDE``
.. include:: FIND_XXX.txt
diff --git a/Help/command/find_library.rst b/Help/command/find_library.rst
index de7f98a..5d07574 100644
--- a/Help/command/find_library.rst
+++ b/Help/command/find_library.rst
@@ -30,7 +30,6 @@ find_library
.. |CMAKE_FIND_ROOT_PATH_MODE_XXX| replace::
:variable:`CMAKE_FIND_ROOT_PATH_MODE_LIBRARY`
-.. |CMAKE_PATH_NAME| replace:: ``LIBRARY``
.. include:: FIND_XXX.txt
When more than one value is given to the ``NAMES`` option this command by
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst
index 6d72879..58dff9d 100644
--- a/Help/command/find_package.rst
+++ b/Help/command/find_package.rst
@@ -238,9 +238,7 @@ enabled.
1. Search paths specified in cmake-specific cache variables. These
are intended to be used on the command line with a ``-DVAR=value``.
- This can be skipped if ``NO_CMAKE_PATH`` is passed or if
- :variable:`CMAKE_FIND_NO_CMAKE_PATH` is set and contains ``ALL`` or
- ``PACKAGE``::
+ This can be skipped if ``NO_CMAKE_PATH`` is passed::
CMAKE_PREFIX_PATH
CMAKE_FRAMEWORK_PATH
@@ -248,9 +246,7 @@ enabled.
2. Search paths specified in cmake-specific environment variables.
These are intended to be set in the user's shell configuration.
- This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed or
- :variable:`CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH` is set and contains
- ``ALL`` or ``PACKAGE``::
+ This can be skipped if ``NO_CMAKE_ENVIRONMENT_PATH`` is passed::
<package>_DIR
CMAKE_PREFIX_PATH
@@ -263,10 +259,9 @@ enabled.
be specified with the ``PATHS`` option.
4. Search the standard system environment variables. This can be
- skipped if ``NO_SYSTEM_ENVIRONMENT_PATH`` is passed or
- :variable:`CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH` is set and contains
- ``ALL`` or ``PACKAGE``. Path entries ending in ``/bin`` or ``/sbin``
- are automatically converted to their parent directories::
+ skipped if ``NO_SYSTEM_ENVIRONMENT_PATH`` is passed. Path entries
+ ending in ``/bin`` or ``/sbin`` are automatically converted to their
+ parent directories::
PATH
diff --git a/Help/command/find_path.rst b/Help/command/find_path.rst
index 748c754..4403cb5 100644
--- a/Help/command/find_path.rst
+++ b/Help/command/find_path.rst
@@ -30,7 +30,6 @@ find_path
.. |CMAKE_FIND_ROOT_PATH_MODE_XXX| replace::
:variable:`CMAKE_FIND_ROOT_PATH_MODE_INCLUDE`
-.. |CMAKE_PATH_NAME| replace:: ``INCLUDE``
.. include:: FIND_XXX.txt
When searching for frameworks, if the file is specified as ``A/b.h``, then
diff --git a/Help/command/find_program.rst b/Help/command/find_program.rst
index d6c954a..d3430c0 100644
--- a/Help/command/find_program.rst
+++ b/Help/command/find_program.rst
@@ -25,7 +25,6 @@ find_program
.. |CMAKE_FIND_ROOT_PATH_MODE_XXX| replace::
:variable:`CMAKE_FIND_ROOT_PATH_MODE_PROGRAM`
-.. |CMAKE_PATH_NAME| replace:: ``PROGRAM``
.. include:: FIND_XXX.txt
When more than one value is given to the ``NAMES`` option this command by
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index ac8701b..3f49572 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -124,12 +124,7 @@ Variables that Change Behavior
/variable/CMAKE_FIND_FRAMEWORK
/variable/CMAKE_FIND_LIBRARY_PREFIXES
/variable/CMAKE_FIND_LIBRARY_SUFFIXES
- /variable/CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH
- /variable/CMAKE_FIND_NO_CMAKE_PATH
- /variable/CMAKE_FIND_NO_CMAKE_SYSTEM_PATH
- /variable/CMAKE_FIND_NO_DEFAULT_PATH
/variable/CMAKE_FIND_NO_INSTALL_PREFIX
- /variable/CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH
/variable/CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY
/variable/CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY
/variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE
diff --git a/Help/variable/CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH.rst b/Help/variable/CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH.rst
deleted file mode 100644
index ee761aa..0000000
--- a/Help/variable/CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH
-------------------------------------
-
-.. |NO_XXX_PATH| replace:: NO_CMAKE_ENVIRONMENT_PATH
-.. include:: CMAKE_FIND_NO_XXX_PATH.txt
-
-See also :variable:`CMAKE_FIND_NO_DEFAULT_PATH`,
-:variable:`CMAKE_FIND_NO_CMAKE_PATH`,
-:variable:`CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH`, and
-:variable:`CMAKE_FIND_NO_CMAKE_SYSTEM_PATH`.
diff --git a/Help/variable/CMAKE_FIND_NO_CMAKE_PATH.rst b/Help/variable/CMAKE_FIND_NO_CMAKE_PATH.rst
deleted file mode 100644
index 0ac6666..0000000
--- a/Help/variable/CMAKE_FIND_NO_CMAKE_PATH.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_FIND_NO_CMAKE_PATH
-------------------------
-
-.. |NO_XXX_PATH| replace:: NO_CMAKE_PATH
-.. include:: CMAKE_FIND_NO_XXX_PATH.txt
-
-See also :variable:`CMAKE_FIND_NO_DEFAULT_PATH`,
-:variable:`CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH`,
-:variable:`CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH`, and
-:variable:`CMAKE_FIND_NO_CMAKE_SYSTEM_PATH`.
diff --git a/Help/variable/CMAKE_FIND_NO_CMAKE_SYSTEM_PATH.rst b/Help/variable/CMAKE_FIND_NO_CMAKE_SYSTEM_PATH.rst
deleted file mode 100644
index 827ef79..0000000
--- a/Help/variable/CMAKE_FIND_NO_CMAKE_SYSTEM_PATH.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_FIND_NO_CMAKE_SYSTEM_PATH
--------------------------------
-
-.. |NO_XXX_PATH| replace:: NO_CMAKE_SYSTEM_PATH
-.. include:: CMAKE_FIND_NO_XXX_PATH.txt
-
-See also :variable:`CMAKE_FIND_NO_DEFAULT_PATH`,
-:variable:`CMAKE_FIND_NO_CMAKE_PATH`,
-:variable:`CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH`, and
-:variable:`CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH`.
diff --git a/Help/variable/CMAKE_FIND_NO_DEFAULT_PATH.rst b/Help/variable/CMAKE_FIND_NO_DEFAULT_PATH.rst
deleted file mode 100644
index 37e8369..0000000
--- a/Help/variable/CMAKE_FIND_NO_DEFAULT_PATH.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_FIND_NO_DEFAULT_PATH
---------------------------
-
-.. |NO_XXX_PATH| replace:: NO_DEFAULT_PATH
-.. include:: CMAKE_FIND_NO_XXX_PATH.txt
-
-See also :variable:`CMAKE_FIND_NO_CMAKE_PATH`,
-:variable:`CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH`,
-:variable:`CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH`, and
-:variable:`CMAKE_FIND_NO_CMAKE_SYSTEM_PATH`.
diff --git a/Help/variable/CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH.rst b/Help/variable/CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH.rst
deleted file mode 100644
index 977083e..0000000
--- a/Help/variable/CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH
--------------------------------------
-
-.. |NO_XXX_PATH| replace:: NO_SYSTEM_ENVIRONMENT_PATH
-.. include:: CMAKE_FIND_NO_XXX_PATH.txt
-
-See also :variable:`CMAKE_FIND_NO_DEFAULT_PATH`,
-:variable:`CMAKE_FIND_NO_CMAKE_PATH`,
-:variable:`CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH`, and
-:variable:`CMAKE_FIND_NO_CMAKE_SYSTEM_PATH`.
diff --git a/Help/variable/CMAKE_FIND_NO_XXX_PATH.txt b/Help/variable/CMAKE_FIND_NO_XXX_PATH.txt
deleted file mode 100644
index ca9ad26..0000000
--- a/Help/variable/CMAKE_FIND_NO_XXX_PATH.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-This variable enables the |NO_XXX_PATH| option to be on by default for the
-various find commands. It's value is a list with valid entries being:
-
-``INCLUDE``
- Enable the option for the :command:`find_file` and :command:`find_path`
- commands.
-
-``LIBRARY``
- Enable the option for the :command:`find_library` command.
-
-``PACKAGE``
- Enable the option for the :command:`find_package` command.
-
-``PROGRAM``
- Enable the option for the :command:`find_program` command.
-
-``ALL``
- Enable the option for all find commands.
-
-The list can contain any combination of valid entries in any order to affect
-the specified find command.
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 8c237ca..913985f 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -309,39 +309,8 @@ void cmFindCommon::GetIgnoredPaths(std::set<std::string>& ignore)
}
//----------------------------------------------------------------------------
-inline bool ListContains2Helper(const cmMakefile* make,
- const std::string& cmakeVar, const std::string& test1,
- const std::string& test2)
-{
- std::vector<std::string> v;
- cmSystemTools::ExpandListArgument(
- make->GetSafeDefinition(cmakeVar), v, true);
- for(std::vector<std::string>::const_iterator i = v.begin();
- i != v.end(); ++i)
- {
- if(*i == test1 || *i == test2)
- {
- return true;
- }
- }
- return false;
-}
-
-//----------------------------------------------------------------------------
bool cmFindCommon::CheckCommonArgument(std::string const& arg)
{
- // Initialize global path options
- this->NoDefaultPath = ListContains2Helper(this->Makefile,
- "CMAKE_FIND_NO_DEFAULT_PATH", "ALL", this->CMakePathName);
- this->NoCMakeEnvironmentPath = ListContains2Helper(this->Makefile,
- "CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH", "ALL", this->CMakePathName);
- this->NoCMakePath = ListContains2Helper(this->Makefile,
- "CMAKE_FIND_NO_CMAKE_PATH", "ALL", this->CMakePathName);
- this->NoSystemEnvironmentPath = ListContains2Helper(this->Makefile,
- "CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH", "ALL", this->CMakePathName);
- this->NoCMakeSystemPath = ListContains2Helper(this->Makefile,
- "CMAKE_FIND_NO_CMAKE_SYSTEM_PATH", "ALL", this->CMakePathName);
-
if(arg == "NO_DEFAULT_PATH")
{
this->NoDefaultPath = true;
-----------------------------------------------------------------------
Summary of changes:
Help/command/FIND_XXX.txt | 20 ++++---------
Help/command/find_file.rst | 1 -
Help/command/find_library.rst | 1 -
Help/command/find_package.rst | 15 ++++------
Help/command/find_path.rst | 1 -
Help/command/find_program.rst | 1 -
Help/manual/cmake-variables.7.rst | 5 ----
.../CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH.rst | 10 -------
Help/variable/CMAKE_FIND_NO_CMAKE_PATH.rst | 10 -------
Help/variable/CMAKE_FIND_NO_CMAKE_SYSTEM_PATH.rst | 10 -------
Help/variable/CMAKE_FIND_NO_DEFAULT_PATH.rst | 10 -------
.../CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH.rst | 10 -------
Help/variable/CMAKE_FIND_NO_XXX_PATH.txt | 21 -------------
Source/cmFindCommon.cxx | 31 --------------------
14 files changed, 11 insertions(+), 135 deletions(-)
delete mode 100644 Help/variable/CMAKE_FIND_NO_CMAKE_ENVIRONMENT_PATH.rst
delete mode 100644 Help/variable/CMAKE_FIND_NO_CMAKE_PATH.rst
delete mode 100644 Help/variable/CMAKE_FIND_NO_CMAKE_SYSTEM_PATH.rst
delete mode 100644 Help/variable/CMAKE_FIND_NO_DEFAULT_PATH.rst
delete mode 100644 Help/variable/CMAKE_FIND_NO_SYSTEM_ENVIRONMENT_PATH.rst
delete mode 100644 Help/variable/CMAKE_FIND_NO_XXX_PATH.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list