diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportCommand.cxx | 7 | ||||
| -rw-r--r-- | Source/cmFindPackageCommand.cxx | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 2536ada..db21c49 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -285,6 +285,13 @@ bool cmExportCommand::HandlePackage(std::vector<std::string> const& args) return false; } + // If the CMAKE_EXPORT_NO_PACKAGE_REGISTRY variable is set the command + // export(PACKAGE) does nothing. + if(this->Makefile->IsOn("CMAKE_EXPORT_NO_PACKAGE_REGISTRY")) + { + return true; + } + // We store the current build directory in the registry as a value // named by a hash of its own content. This is deterministic and is // unique with high probability. diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index a790e00..55a61f5 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -90,6 +90,18 @@ bool cmFindPackageCommand this->UseLib64Paths = true; } + // Check if User Package Registry should be disabled + if(this->Makefile->IsOn("CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY")) + { + this->NoUserRegistry = true; + } + + // Check if System Package Registry should be disabled + if(this->Makefile->IsOn("CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY")) + { + this->NoSystemRegistry = true; + } + // Find the current root path mode. this->SelectDefaultRootPathMode(); |