[Cmake-commits] CMake branch, next, updated. v3.0.2-5317-g5cbabd2
Brad King
brad.king at kitware.com
Fri Sep 12 13:08:11 EDT 2014
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 5cbabd26b09d3798015b99288e92aef646154822 (commit)
via da0fd58f38118a6ef82dc14835e9e41cd8306e03 (commit)
from 86964cef00ecde8214f4643017a1a557865ce3a7 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cbabd26b09d3798015b99288e92aef646154822
commit 5cbabd26b09d3798015b99288e92aef646154822
Merge: 86964ce da0fd58
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 12 13:08:10 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 12 13:08:10 2014 -0400
Merge topic 'add-find-root-system_only-mode' into next
da0fd58f Revert topic 'add-find-root-system_only-mode'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0fd58f38118a6ef82dc14835e9e41cd8306e03
commit da0fd58f38118a6ef82dc14835e9e41cd8306e03
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 12 13:07:45 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 12 13:07:45 2014 -0400
Revert topic 'add-find-root-system_only-mode'
It will be revised and restored.
diff --git a/Help/command/FIND_XXX.txt b/Help/command/FIND_XXX.txt
index 2d97e80..5889e90 100644
--- a/Help/command/FIND_XXX.txt
+++ b/Help/command/FIND_XXX.txt
@@ -21,7 +21,6 @@ The general signature is:
[NO_SYSTEM_ENVIRONMENT_PATH]
[NO_CMAKE_SYSTEM_PATH]
[CMAKE_FIND_ROOT_PATH_BOTH |
- CMAKE_FIND_ROOT_PATH_SYSTEM_ONLY |
ONLY_CMAKE_FIND_ROOT_PATH |
NO_CMAKE_FIND_ROOT_PATH]
)
diff --git a/Help/command/FIND_XXX_ROOT.txt b/Help/command/FIND_XXX_ROOT.txt
index a4a9a32..b5cab68 100644
--- a/Help/command/FIND_XXX_ROOT.txt
+++ b/Help/command/FIND_XXX_ROOT.txt
@@ -21,5 +21,3 @@ the search order will be as described above. If
NO_CMAKE_FIND_ROOT_PATH is used then :variable:`CMAKE_FIND_ROOT_PATH` will not be
used. If ONLY_CMAKE_FIND_ROOT_PATH is used then only the re-rooted
directories and directories below :variable:`CMAKE_STAGING_PREFIX` will be searched.
-If CMAKE_FIND_ROOT_PATH_SYSTEM_ONLY is used then the paths described above
-wll be re-rooted and searched followed by the original user-spefied paths.
diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst
index 3a1e17f..190d05c 100644
--- a/Help/command/find_package.rst
+++ b/Help/command/find_package.rst
@@ -72,7 +72,6 @@ The complete Config mode command signature is::
[NO_CMAKE_SYSTEM_PATH]
[NO_CMAKE_SYSTEM_PACKAGE_REGISTRY]
[CMAKE_FIND_ROOT_PATH_BOTH |
- CMAKE_FIND_ROOT_PATH_SYSTEM_ONLY |
ONLY_CMAKE_FIND_ROOT_PATH |
NO_CMAKE_FIND_ROOT_PATH])
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index 3be5e86..f36a43c 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -111,9 +111,9 @@ as:
set(CMAKE_CXX_COMPILER /home/devel/gcc-4.7-linaro-rpi-gnueabihf/bin/arm-linux-gnueabihf-g++)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
- set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY SYSTEM_ONLY)
- set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE SYSTEM_ONLY)
- set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE SYSTEM_ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
The :variable:`CMAKE_SYSTEM_NAME` is the CMake-identifier of the target platform
to build for.
diff --git a/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt b/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
index e2eb84e..ab65e09 100644
--- a/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
+++ b/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
@@ -4,7 +4,5 @@ This variable controls whether the :variable:`CMAKE_FIND_ROOT_PATH` and
If set to ``ONLY``, then only the roots in :variable:`CMAKE_FIND_ROOT_PATH`
will be searched. If set to ``NEVER``, then the roots in
:variable:`CMAKE_FIND_ROOT_PATH` will be ignored and only the host system
-root will be used. If set to ``SYSTEM_ONLY``, then the host system paths
-will be re-rooted and searched followed by the original user specified
-paths. If set to ``BOTH``, then the host system paths and the
+root will be used. If set to ``BOTH``, then the host system paths and the
paths in :variable:`CMAKE_FIND_ROOT_PATH` will be searched.
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index e03cebf..e4e819a 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -194,7 +194,7 @@ bool cmFindBase::ParseArguments(std::vector<std::string> const& argsIn)
// Filter out ignored paths from the prefix list
std::set<std::string> ignored;
this->GetIgnoredPaths(ignored);
- this->FilterPaths(ignored);
+ this->FilterPaths(this->SearchPaths, ignored);
this->ComputeFinalPaths();
@@ -376,53 +376,51 @@ void cmFindBase::AddCMakeSystemVariablePath()
//----------------------------------------------------------------------------
void cmFindBase::AddUserHintsPath()
{
- this->AddPathsInternal(this->UserHints, CMakePath,
- this->FindRootPathMode != RootPathModeSystemOnly);
+ this->AddPathsInternal(this->UserHints, CMakePath);
}
//----------------------------------------------------------------------------
void cmFindBase::AddUserGuessPath()
{
- this->AddPathsInternal(this->UserPaths, CMakePath,
- this->FindRootPathMode != RootPathModeSystemOnly);
+ this->AddPathsInternal(this->UserPaths, CMakePath);
}
//----------------------------------------------------------------------------
void cmFindBase::AddPathSuffixes()
{
- std::vector<std::string> adjustedPaths;
- std::vector<bool> adjustedPathsRerootable;
-
- std::vector<std::string>::iterator pi = this->SearchPaths.begin();
- std::vector<bool>::const_iterator pri = this->SearchPathsRerootable.begin();
- for(; pi != this->SearchPaths.end(); ++pi, ++pri)
+ std::vector<std::string>& paths = this->SearchPaths;
+ std::vector<std::string> finalPath = paths;
+ std::vector<std::string>::iterator i;
+ // clear the path
+ paths.clear();
+ // convert all paths to unix slashes and add search path suffixes
+ // if there are any
+ for(i = finalPath.begin();
+ i != finalPath.end(); ++i)
{
- // Convert all paths to unix slashes
- cmSystemTools::ConvertToUnixSlashes(*pi);
-
- // Add trailing slash if appropriate
- if(!pi->empty() && *pi->rbegin() != '/')
- {
- *pi += std::string("/");
- }
-
- // Add suffix to all paths because the search path may be modified
- // later with lib being replaced for lib64 which may exist
- std::vector<std::string>::iterator si;
- for(si = this->SearchPathSuffixes.begin();
- si != this->SearchPathSuffixes.end(); ++si)
- {
- adjustedPaths.push_back(*pi+*si);
- adjustedPathsRerootable.push_back(*pri);
+ cmSystemTools::ConvertToUnixSlashes(*i);
+ // copy each finalPath combined with SearchPathSuffixes
+ // to the SearchPaths ivar
+ for(std::vector<std::string>::iterator j =
+ this->SearchPathSuffixes.begin();
+ j != this->SearchPathSuffixes.end(); ++j)
+ {
+ // if *i is only / then do not add a //
+ // this will get incorrectly considered a network
+ // path on windows and cause huge delays.
+ std::string p = *i;
+ if(p.size() && p[p.size()-1] != '/')
+ {
+ p += std::string("/");
+ }
+ p += *j;
+ // add to all paths because the search path may be modified
+ // later with lib being replaced for lib64 which may exist
+ paths.push_back(p);
}
-
- // And lastly, keep the originals
- adjustedPaths.push_back(*pi);
- adjustedPathsRerootable.push_back(*pri);
+ // now put the path without the path suffixes in the SearchPaths
+ paths.push_back(*i);
}
-
- this->SearchPaths = adjustedPaths;
- this->SearchPathsRerootable = adjustedPathsRerootable;
}
void cmFindBase::PrintFindStuff()
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 8258e11..10241f2 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -64,10 +64,6 @@ void cmFindCommon::SelectDefaultRootPathMode()
{
this->FindRootPathMode = RootPathModeBoth;
}
- else if (rootPathMode=="SYSTEM_ONLY")
- {
- this->FindRootPathMode = RootPathModeSystemOnly;
- }
}
//----------------------------------------------------------------------------
@@ -129,14 +125,6 @@ void cmFindCommon::SelectDefaultMacMode()
//----------------------------------------------------------------------------
void cmFindCommon::RerootPaths(std::vector<std::string>& paths)
{
- std::vector<bool> pathsRerootable(paths.size(), true);
- this->RerootPaths(paths, pathsRerootable);
-}
-
-//----------------------------------------------------------------------------
-void cmFindCommon::RerootPaths(std::vector<std::string>& paths,
- std::vector<bool> &pathsRerootable)
-{
#if 0
for(std::vector<std::string>::const_iterator i = paths.begin();
i != paths.end(); ++i)
@@ -150,12 +138,12 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths,
{
return;
}
- const char* rootPath =
- this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
const char* sysroot =
this->Makefile->GetDefinition("CMAKE_SYSROOT");
- const bool noRootPath = !rootPath || !*rootPath;
+ const char* rootPath =
+ this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
const bool noSysroot = !sysroot || !*sysroot;
+ const bool noRootPath = !rootPath || !*rootPath;
if(noSysroot && noRootPath)
{
return;
@@ -181,43 +169,37 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths,
this->Makefile->GetDefinition("CMAKE_STAGING_PREFIX");
// Copy the original set of unrooted paths.
- std::vector<std::string> unrootedPaths;
- std::vector<bool> unrootedPathsRerootable;
- unrootedPaths.swap(paths);
- unrootedPathsRerootable.swap(pathsRerootable);
-
- std::vector<std::string>::const_iterator ri;
- for(ri = roots.begin(); ri != roots.end(); ++ri)
- {
- std::vector<std::string>::const_iterator upi;
- std::vector<bool>::const_iterator upri;
- for(upi = unrootedPaths.begin(), upri = unrootedPathsRerootable.begin();
- upi != unrootedPaths.end(); ++upi, ++upri)
+ std::vector<std::string> unrootedPaths = paths;
+ paths.clear();
+
+ for(std::vector<std::string>::const_iterator ri = roots.begin();
+ ri != roots.end(); ++ri)
+ {
+ for(std::vector<std::string>::const_iterator ui = unrootedPaths.begin();
+ ui != unrootedPaths.end(); ++ui)
{
// Place the unrooted path under the current root if it is not
// already inside. Skip the unrooted path if it is relative to
// a user home directory or is empty.
std::string rootedDir;
- if(!*upri
- || cmSystemTools::IsSubDirectory(upi->c_str(), ri->c_str())
- || (stagePrefix
- && cmSystemTools::IsSubDirectory(upi->c_str(), stagePrefix)))
+ if(cmSystemTools::IsSubDirectory(ui->c_str(), ri->c_str())
+ || (stagePrefix
+ && cmSystemTools::IsSubDirectory(ui->c_str(), stagePrefix)))
{
- rootedDir = *upi;
+ rootedDir = *ui;
}
- else if(!upi->empty() && *upi->begin() != '~')
+ else if(!ui->empty() && (*ui)[0] != '~')
{
// Start with the new root.
rootedDir = *ri;
rootedDir += "/";
// Append the original path with its old root removed.
- rootedDir += cmSystemTools::SplitPathRootComponent(upi->c_str());
+ rootedDir += cmSystemTools::SplitPathRootComponent(ui->c_str());
}
// Store the new path.
paths.push_back(rootedDir);
- pathsRerootable.push_back(*upri);
}
}
@@ -226,30 +208,25 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths,
if(this->FindRootPathMode == RootPathModeBoth)
{
paths.insert(paths.end(), unrootedPaths.begin(), unrootedPaths.end());
- pathsRerootable.insert(pathsRerootable.end(),
- unrootedPathsRerootable.begin(), unrootedPathsRerootable.end());
}
}
//----------------------------------------------------------------------------
-void cmFindCommon::FilterPaths(const std::set<std::string>& ignore)
+void cmFindCommon::FilterPaths(std::vector<std::string>& paths,
+ const std::set<std::string>& ignore)
{
- std::vector<std::string> filtered;
- std::vector<bool> filteredRerootable;
+ // Now filter out anything that's in the ignore set.
+ std::vector<std::string> unfiltered;
+ unfiltered.swap(paths);
- std::vector<std::string>::const_iterator pi = this->SearchPaths.begin();
- std::vector<bool>::const_iterator pri = this->SearchPathsRerootable.begin();
- for(; pi != this->SearchPaths.end(); ++pi, ++pri)
+ for(std::vector<std::string>::iterator pi = unfiltered.begin();
+ pi != unfiltered.end(); ++pi)
{
- // Now filter out anything that's in the ignore set.
if (ignore.count(*pi) == 0)
{
- filtered.push_back(*pi);
- filteredRerootable.push_back(*pri);
+ paths.push_back(*pi);
}
}
- this->SearchPaths = filtered;
- this->SearchPathsRerootable = filteredRerootable;
}
@@ -326,10 +303,6 @@ bool cmFindCommon::CheckCommonArgument(std::string const& arg)
{
this->FindRootPathMode = RootPathModeBoth;
}
- else if(arg == "CMAKE_FIND_ROOT_PATH_SYSTEM_ONLY")
- {
- this->FindRootPathMode = RootPathModeSystemOnly;
- }
else
{
// The argument is not one of the above.
@@ -428,18 +401,18 @@ void cmFindCommon::AddEnvPath(const char* variable)
//----------------------------------------------------------------------------
void cmFindCommon::AddPathsInternal(std::vector<std::string> const& in_paths,
- PathType pathType, bool reRootable)
+ PathType pathType)
{
for(std::vector<std::string>::const_iterator i = in_paths.begin();
i != in_paths.end(); ++i)
{
- this->AddPathInternal(*i, pathType, reRootable);
+ this->AddPathInternal(*i, pathType);
}
}
//----------------------------------------------------------------------------
void cmFindCommon::AddPathInternal(std::string const& in_path,
- PathType pathType, bool reRootable)
+ PathType pathType)
{
if(in_path.empty())
{
@@ -461,23 +434,25 @@ void cmFindCommon::AddPathInternal(std::string const& in_path,
if(this->SearchPathsEmitted.insert(fullPath).second)
{
this->SearchPaths.push_back(fullPath);
- this->SearchPathsRerootable.push_back(reRootable);
}
}
//----------------------------------------------------------------------------
void cmFindCommon::ComputeFinalPaths()
{
+ std::vector<std::string>& paths = this->SearchPaths;
+
// Expand list of paths inside all search roots.
- this->RerootPaths(this->SearchPaths, this->SearchPathsRerootable);
+ this->RerootPaths(paths);
// Add a trailing slash to all paths to aid the search process.
- for(std::vector<std::string>::iterator pi = this->SearchPaths.begin();
- pi != this->SearchPaths.end(); ++pi)
+ for(std::vector<std::string>::iterator i = paths.begin();
+ i != paths.end(); ++i)
{
- if(!pi->empty() && *pi->rbegin() != '/')
+ std::string& p = *i;
+ if(!p.empty() && p[p.size()-1] != '/')
{
- *pi += "/";
+ p += "/";
}
}
}
diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h
index 07cc20c..5a905cd 100644
--- a/Source/cmFindCommon.h
+++ b/Source/cmFindCommon.h
@@ -32,22 +32,20 @@ protected:
enum RootPathMode { RootPathModeBoth,
RootPathModeOnlyRootPath,
- RootPathModeNoRootPath,
- RootPathModeSystemOnly };
+ RootPathModeNoRootPath };
enum PathType { FullPath, CMakePath, EnvPath };
/** Place a set of search paths under the search roots. */
void RerootPaths(std::vector<std::string>& paths);
- void RerootPaths(std::vector<std::string>& paths,
- std::vector<bool> &pathsRerootable);
/** Get ignored paths from CMAKE_[SYSTEM_]IGNORE_path variables. */
void GetIgnoredPaths(std::vector<std::string>& ignore);
void GetIgnoredPaths(std::set<std::string>& ignore);
/** Remove paths in the ignore set from the supplied vector. */
- void FilterPaths(const std::set<std::string>& ignore);
+ void FilterPaths(std::vector<std::string>& paths,
+ const std::set<std::string>& ignore);
/** Compute final search path list (reroot + trailing slash). */
void ComputeFinalPaths();
@@ -68,9 +66,8 @@ protected:
void AddCMakePath(const std::string& variable);
void AddEnvPath(const char* variable);
void AddPathsInternal(std::vector<std::string> const& in_paths,
- PathType pathType, bool reRootable = true);
- void AddPathInternal(std::string const& in_path, PathType pathType,
- bool reRootable = true);
+ PathType pathType);
+ void AddPathInternal(std::string const& in_path, PathType pathType);
void SetMakefile(cmMakefile* makefile);
@@ -84,7 +81,6 @@ protected:
std::vector<std::string> UserPaths;
std::vector<std::string> UserHints;
std::vector<std::string> SearchPaths;
- std::vector<bool> SearchPathsRerootable;
std::set<std::string> SearchPathsEmitted;
bool SearchFrameworkFirst;
diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx
index 1d73575..fe5e45f 100644
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@@ -86,24 +86,18 @@ bool cmFindLibraryCommand
//----------------------------------------------------------------------------
void cmFindLibraryCommand::AddArchitecturePaths(const char* suffix)
{
- std::vector<std::string> originalPaths;
- std::vector<bool> originalPathsRerootable;
- originalPaths.swap(this->SearchPaths);
- originalPathsRerootable.swap(this->SearchPathsRerootable);
-
- std::vector<std::string>::const_iterator opi;
- std::vector<bool>::const_iterator opri;
- for(opi = originalPaths.begin(), opri = originalPathsRerootable.begin();
- opi != originalPaths.end(); ++opi, ++opri)
+ std::vector<std::string> original;
+ original.swap(this->SearchPaths);
+ for(std::vector<std::string>::iterator i = original.begin();
+ i != original.end(); ++i)
{
- this->AddArchitecturePath(*opi, *opri, 0, suffix);
+ this->AddArchitecturePath(*i, 0, suffix);
}
}
//----------------------------------------------------------------------------
void cmFindLibraryCommand::AddArchitecturePath(
- std::string const& dir, bool rerootable,
- std::string::size_type start_pos,
+ std::string const& dir, std::string::size_type start_pos,
const char* suffix, bool fresh)
{
std::string::size_type pos = dir.find("lib/", start_pos);
@@ -117,13 +111,13 @@ void cmFindLibraryCommand::AddArchitecturePath(
{
next_dir += dir.substr(pos+3);
std::string::size_type next_pos = pos+3+strlen(suffix)+1;
- this->AddArchitecturePath(next_dir, rerootable, next_pos, suffix);
+ this->AddArchitecturePath(next_dir, next_pos, suffix);
}
// Follow "lib".
if(cmSystemTools::FileIsDirectory(cur_dir.c_str()))
{
- this->AddArchitecturePath(dir, rerootable, pos+3+1, suffix, false);
+ this->AddArchitecturePath(dir, pos+3+1, suffix, false);
}
}
if(fresh)
@@ -133,14 +127,12 @@ void cmFindLibraryCommand::AddArchitecturePath(
if(cmSystemTools::FileIsDirectory(cur_dir.c_str()))
{
this->SearchPaths.push_back(cur_dir);
- this->SearchPathsRerootable.push_back(rerootable);
}
// Now add the original unchanged path
if(cmSystemTools::FileIsDirectory(dir.c_str()))
{
this->SearchPaths.push_back(dir);
- this->SearchPathsRerootable.push_back(rerootable);
}
}
}
diff --git a/Source/cmFindLibraryCommand.h b/Source/cmFindLibraryCommand.h
index edc378c..e257174 100644
--- a/Source/cmFindLibraryCommand.h
+++ b/Source/cmFindLibraryCommand.h
@@ -55,9 +55,10 @@ public:
protected:
void AddArchitecturePaths(const char* suffix);
- void AddArchitecturePath(std::string const& dir, bool rerootable,
+ void AddArchitecturePath(std::string const& dir,
std::string::size_type start_pos,
- const char* suffix, bool fresh = true);
+ const char* suffix,
+ bool fresh = true);
std::string FindLibrary();
private:
std::string FindNormalLibrary();
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 1a578a0..55a61f5 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -927,7 +927,7 @@ bool cmFindPackageCommand::FindConfig()
//----------------------------------------------------------------------------
bool cmFindPackageCommand::FindPrefixedConfig()
{
- const std::vector<std::string>& prefixes = this->SearchPaths;
+ std::vector<std::string>& prefixes = this->SearchPaths;
for(std::vector<std::string>::const_iterator pi = prefixes.begin();
pi != prefixes.end(); ++pi)
{
@@ -942,7 +942,7 @@ bool cmFindPackageCommand::FindPrefixedConfig()
//----------------------------------------------------------------------------
bool cmFindPackageCommand::FindFrameworkConfig()
{
- const std::vector<std::string>& prefixes = this->SearchPaths;
+ std::vector<std::string>& prefixes = this->SearchPaths;
for(std::vector<std::string>::const_iterator i = prefixes.begin();
i != prefixes.end(); ++i)
{
@@ -957,7 +957,7 @@ bool cmFindPackageCommand::FindFrameworkConfig()
//----------------------------------------------------------------------------
bool cmFindPackageCommand::FindAppBundleConfig()
{
- const std::vector<std::string>& prefixes = this->SearchPaths;
+ std::vector<std::string>& prefixes = this->SearchPaths;
for(std::vector<std::string>::const_iterator i = prefixes.begin();
i != prefixes.end(); ++i)
{
@@ -1442,16 +1442,14 @@ void cmFindPackageCommand::AddPrefixesCMakeSystemVariable()
void cmFindPackageCommand::AddPrefixesUserGuess()
{
// Add guesses specified by the caller.
- this->AddPathsInternal(this->UserPaths, CMakePath,
- this->FindRootPathMode != RootPathModeSystemOnly);
+ this->AddPathsInternal(this->UserPaths, CMakePath);
}
//----------------------------------------------------------------------------
void cmFindPackageCommand::AddPrefixesUserHints()
{
// Add hints specified by the caller.
- this->AddPathsInternal(this->UserHints, CMakePath,
- this->FindRootPathMode != RootPathModeSystemOnly);
+ this->AddPathsInternal(this->UserHints, CMakePath);
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Help/command/FIND_XXX.txt | 1 -
Help/command/FIND_XXX_ROOT.txt | 2 -
Help/command/find_package.rst | 1 -
Help/manual/cmake-toolchains.7.rst | 6 +-
Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt | 4 +-
Source/cmFindBase.cxx | 68 ++++++++--------
Source/cmFindCommon.cxx | 97 +++++++++--------------
Source/cmFindCommon.h | 14 ++--
Source/cmFindLibraryCommand.cxx | 24 ++----
Source/cmFindLibraryCommand.h | 5 +-
Source/cmFindPackageCommand.cxx | 12 ++-
11 files changed, 94 insertions(+), 140 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list