diff options
| author | Alex Neundorf <neundorf@kde.org> | 2010-08-29 15:07:39 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2010-08-29 15:07:39 (GMT) |
| commit | dfe9c95129b9ca05ea8ca98e69d973c9c40e5a4e (patch) | |
| tree | 3b9abcea94d2762b138e6ef628a9bbff809596d5 /Source/cmFindPackageCommand.h | |
| parent | 737261785a85f365c28ce4fb3da7695f8c09e139 (diff) | |
| download | CMake-dfe9c95129b9ca05ea8ca98e69d973c9c40e5a4e.zip CMake-dfe9c95129b9ca05ea8ca98e69d973c9c40e5a4e.tar.gz CMake-dfe9c95129b9ca05ea8ca98e69d973c9c40e5a4e.tar.bz2 | |
Record all considered Config files and their versions.
As suggested on cmake-devel, find_package in Config-mode now records
all considered config-files and their versions in
<package>_CONSIDERED_CONFIGS and <package>_CONSIDERED_VERSIONS respectively.
Alex
Diffstat (limited to 'Source/cmFindPackageCommand.h')
| -rw-r--r-- | Source/cmFindPackageCommand.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index 53ea4fc..2495d6c 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -98,7 +98,8 @@ private: bool CheckDirectory(std::string const& dir); bool FindConfigFile(std::string const& dir, std::string& file); bool CheckVersion(std::string const& config_file); - bool CheckVersionFile(std::string const& version_file); + bool CheckVersionFile(std::string const& version_file, + std::string& result_version); bool SearchPrefix(std::string const& prefix); bool SearchFrameworkPrefix(std::string const& prefix_in); bool SearchAppBundlePrefix(std::string const& prefix_in); @@ -137,6 +138,8 @@ private: std::vector<std::string> Names; std::vector<std::string> Configs; std::set<std::string> IgnoredPaths; + std::vector<std::string> ConsideredConfigFiles; + std::vector<std::string> ConsideredVersions; }; #endif |