find_package: Drop search in recent cmake-gui locations
The find_package command, on Windows, has always searched build trees recently visited by cmake-gui (or CMakeSetup at one time). This was done when the command was created with the intention of simplifying workflows involving building multiple dependent projects. However, this behavior depends on recent developer interaction and therefore can create different find results based on transient system states. It can lead to surprising results and user confusion. Since this behavior was first added CMake has gained many more search options, better error messages when a package is not found, and a package registry. The latter in particular allows projects to make their build trees available for dependent projects to find without user intervention. Therefore the originally intended workflow can be achieved in other, more stable ways. After the above evoluion of find_package we have now decided that the magic search-where-cmake-gui-was behavior does more harm than good. Drop it. We do not need a policy for this behavior change because it only affects interactive use.
This commit is contained in:
parent
8d48446372
commit
1506f9ca56
|
@ -68,7 +68,7 @@ The complete Config mode command signature is::
|
||||||
[NO_CMAKE_PATH]
|
[NO_CMAKE_PATH]
|
||||||
[NO_SYSTEM_ENVIRONMENT_PATH]
|
[NO_SYSTEM_ENVIRONMENT_PATH]
|
||||||
[NO_CMAKE_PACKAGE_REGISTRY]
|
[NO_CMAKE_PACKAGE_REGISTRY]
|
||||||
[NO_CMAKE_BUILDS_PATH]
|
[NO_CMAKE_BUILDS_PATH] # Deprecated; does nothing.
|
||||||
[NO_CMAKE_SYSTEM_PATH]
|
[NO_CMAKE_SYSTEM_PATH]
|
||||||
[NO_CMAKE_SYSTEM_PACKAGE_REGISTRY]
|
[NO_CMAKE_SYSTEM_PACKAGE_REGISTRY]
|
||||||
[CMAKE_FIND_ROOT_PATH_BOTH |
|
[CMAKE_FIND_ROOT_PATH_BOTH |
|
||||||
|
@ -265,20 +265,14 @@ enabled.
|
||||||
|
|
||||||
PATH
|
PATH
|
||||||
|
|
||||||
5. Search project build trees recently configured in a :manual:`cmake-gui(1)`.
|
5. Search paths stored in the CMake :ref:`User Package Registry`.
|
||||||
This can be skipped if ``NO_CMAKE_BUILDS_PATH`` is passed. It is intended
|
|
||||||
for the case when a user is building multiple dependent projects one
|
|
||||||
after another.
|
|
||||||
(This step is implemented only on Windows.)
|
|
||||||
|
|
||||||
6. Search paths stored in the CMake :ref:`User Package Registry`.
|
|
||||||
This can be skipped if ``NO_CMAKE_PACKAGE_REGISTRY`` is passed or by
|
This can be skipped if ``NO_CMAKE_PACKAGE_REGISTRY`` is passed or by
|
||||||
setting the :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY`
|
setting the :variable:`CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY`
|
||||||
to ``TRUE``.
|
to ``TRUE``.
|
||||||
See the :manual:`cmake-packages(7)` manual for details on the user
|
See the :manual:`cmake-packages(7)` manual for details on the user
|
||||||
package registry.
|
package registry.
|
||||||
|
|
||||||
7. Search cmake variables defined in the Platform files for the
|
6. Search cmake variables defined in the Platform files for the
|
||||||
current system. This can be skipped if ``NO_CMAKE_SYSTEM_PATH`` is
|
current system. This can be skipped if ``NO_CMAKE_SYSTEM_PATH`` is
|
||||||
passed::
|
passed::
|
||||||
|
|
||||||
|
@ -286,14 +280,14 @@ enabled.
|
||||||
CMAKE_SYSTEM_FRAMEWORK_PATH
|
CMAKE_SYSTEM_FRAMEWORK_PATH
|
||||||
CMAKE_SYSTEM_APPBUNDLE_PATH
|
CMAKE_SYSTEM_APPBUNDLE_PATH
|
||||||
|
|
||||||
8. Search paths stored in the CMake :ref:`System Package Registry`.
|
7. Search paths stored in the CMake :ref:`System Package Registry`.
|
||||||
This can be skipped if ``NO_CMAKE_SYSTEM_PACKAGE_REGISTRY`` is passed
|
This can be skipped if ``NO_CMAKE_SYSTEM_PACKAGE_REGISTRY`` is passed
|
||||||
or by setting the
|
or by setting the
|
||||||
:variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` to ``TRUE``.
|
:variable:`CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY` to ``TRUE``.
|
||||||
See the :manual:`cmake-packages(7)` manual for details on the system
|
See the :manual:`cmake-packages(7)` manual for details on the system
|
||||||
package registry.
|
package registry.
|
||||||
|
|
||||||
9. Search paths specified by the ``PATHS`` option. These are typically
|
8. Search paths specified by the ``PATHS`` option. These are typically
|
||||||
hard-coded guesses.
|
hard-coded guesses.
|
||||||
|
|
||||||
.. |FIND_XXX| replace:: find_package
|
.. |FIND_XXX| replace:: find_package
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
find_package-no-cmake-gui-paths
|
||||||
|
-------------------------------
|
||||||
|
|
||||||
|
* The :command:`find_package` command no longer considers project
|
||||||
|
build trees recently configured in a :manual:`cmake-gui(1)`.
|
||||||
|
This was previously done only on Windows and is now never done.
|
||||||
|
The ``NO_CMAKE_BUILDS_PATH`` option is now ignored if given
|
||||||
|
and effectively always on.
|
||||||
|
Projects may populate the :ref:`User Package Registry` to aid
|
||||||
|
users building multiple dependent projects one after another.
|
|
@ -42,7 +42,6 @@ cmFindPackageCommand::cmFindPackageCommand()
|
||||||
this->Required = false;
|
this->Required = false;
|
||||||
this->NoUserRegistry = false;
|
this->NoUserRegistry = false;
|
||||||
this->NoSystemRegistry = false;
|
this->NoSystemRegistry = false;
|
||||||
this->NoBuilds = false;
|
|
||||||
this->UseConfigFiles = true;
|
this->UseConfigFiles = true;
|
||||||
this->UseFindModules = true;
|
this->UseFindModules = true;
|
||||||
this->DebugMode = false;
|
this->DebugMode = false;
|
||||||
|
@ -246,7 +245,7 @@ bool cmFindPackageCommand
|
||||||
}
|
}
|
||||||
else if(args[i] == "NO_CMAKE_BUILDS_PATH")
|
else if(args[i] == "NO_CMAKE_BUILDS_PATH")
|
||||||
{
|
{
|
||||||
this->NoBuilds = true;
|
// Ignore legacy option.
|
||||||
configArgs.insert(i);
|
configArgs.insert(i);
|
||||||
doing = DoingNone;
|
doing = DoingNone;
|
||||||
}
|
}
|
||||||
|
@ -1142,10 +1141,6 @@ void cmFindPackageCommand::ComputePrefixes()
|
||||||
{
|
{
|
||||||
this->FillPrefixesUserRegistry();
|
this->FillPrefixesUserRegistry();
|
||||||
}
|
}
|
||||||
if(!this->NoBuilds)
|
|
||||||
{
|
|
||||||
this->FillPrefixesBuilds();
|
|
||||||
}
|
|
||||||
if(!this->NoCMakeSystemPath)
|
if(!this->NoCMakeSystemPath)
|
||||||
{
|
{
|
||||||
this->FillPrefixesCMakeSystemVariable();
|
this->FillPrefixesCMakeSystemVariable();
|
||||||
|
@ -1437,29 +1432,6 @@ bool cmFindPackageCommand::CheckPackageRegistryEntry(const std::string& fname,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
|
||||||
void cmFindPackageCommand::FillPrefixesBuilds()
|
|
||||||
{
|
|
||||||
cmSearchPath &paths = this->LabeledPaths[PathLabel::Builds];
|
|
||||||
|
|
||||||
// It is likely that CMake will have recently built the project.
|
|
||||||
for(int i=0; i <= 10; ++i)
|
|
||||||
{
|
|
||||||
std::ostringstream r;
|
|
||||||
r <<
|
|
||||||
"[HKEY_CURRENT_USER\\Software\\Kitware\\CMakeSetup\\"
|
|
||||||
"Settings\\StartPath;WhereBuild" << i << "]";
|
|
||||||
std::string f = r.str();
|
|
||||||
cmSystemTools::ExpandRegistryValues(f);
|
|
||||||
cmSystemTools::ConvertToUnixSlashes(f);
|
|
||||||
if(cmSystemTools::FileIsFullPath(f.c_str()) &&
|
|
||||||
cmSystemTools::FileIsDirectory(f))
|
|
||||||
{
|
|
||||||
paths.AddPath(f);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
void cmFindPackageCommand::FillPrefixesCMakeSystemVariable()
|
void cmFindPackageCommand::FillPrefixesCMakeSystemVariable()
|
||||||
{
|
{
|
||||||
|
|
|
@ -89,7 +89,6 @@ private:
|
||||||
void FillPrefixesSystemEnvironment();
|
void FillPrefixesSystemEnvironment();
|
||||||
void FillPrefixesUserRegistry();
|
void FillPrefixesUserRegistry();
|
||||||
void FillPrefixesSystemRegistry();
|
void FillPrefixesSystemRegistry();
|
||||||
void FillPrefixesBuilds();
|
|
||||||
void FillPrefixesCMakeSystemVariable();
|
void FillPrefixesCMakeSystemVariable();
|
||||||
void FillPrefixesUserGuess();
|
void FillPrefixesUserGuess();
|
||||||
void FillPrefixesUserHints();
|
void FillPrefixesUserHints();
|
||||||
|
@ -138,7 +137,6 @@ private:
|
||||||
bool UseFindModules;
|
bool UseFindModules;
|
||||||
bool NoUserRegistry;
|
bool NoUserRegistry;
|
||||||
bool NoSystemRegistry;
|
bool NoSystemRegistry;
|
||||||
bool NoBuilds;
|
|
||||||
bool DebugMode;
|
bool DebugMode;
|
||||||
bool UseLib64Paths;
|
bool UseLib64Paths;
|
||||||
bool PolicyScope;
|
bool PolicyScope;
|
||||||
|
|
Loading…
Reference in New Issue