Merge topic 'find_package-no-cmake-gui-paths'

1506f9ca find_package: Drop search in recent cmake-gui locations
8d484463 FindFLTK: Drop search in recent cmake-gui locations

2 files changed, 1 insertions, 31 deletions

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4d568e9..68a6558 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -42,7 +42,6 @@ cmFindPackageCommand::cmFindPackageCommand()
   this->Required = false;
   this->NoUserRegistry = false;
   this->NoSystemRegistry = false;
-  this->NoBuilds = false;
   this->UseConfigFiles = true;
   this->UseFindModules = true;
   this->DebugMode = false;
@@ -246,7 +245,7 @@ bool cmFindPackageCommand
       }
     else if(args[i] == "NO_CMAKE_BUILDS_PATH")
       {
-      this->NoBuilds = true;
+      // Ignore legacy option.
       configArgs.insert(i);
       doing = DoingNone;
       }
@@ -1142,10 +1141,6 @@ void cmFindPackageCommand::ComputePrefixes()
       {
       this->FillPrefixesUserRegistry();
       }
-    if(!this->NoBuilds)
-      {
-      this->FillPrefixesBuilds();
-      }
     if(!this->NoCMakeSystemPath)
       {
       this->FillPrefixesCMakeSystemVariable();
@@ -1438,29 +1433,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()
 {
   cmSearchPath &paths = this->LabeledPaths[PathLabel::CMakeSystem];
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index 949dcb1..3eee404 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -89,7 +89,6 @@ private:
   void FillPrefixesSystemEnvironment();
   void FillPrefixesUserRegistry();
   void FillPrefixesSystemRegistry();
-  void FillPrefixesBuilds();
   void FillPrefixesCMakeSystemVariable();
   void FillPrefixesUserGuess();
   void FillPrefixesUserHints();
@@ -138,7 +137,6 @@ private:
   bool UseFindModules;
   bool NoUserRegistry;
   bool NoSystemRegistry;
-  bool NoBuilds;
   bool DebugMode;
   bool UseLib64Paths;
   bool PolicyScope;