diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-17 15:31:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-12-17 15:31:19 (GMT) |
| commit | 9bcaff02ff066e9bdd69e3e1e3134aa65c53c121 (patch) | |
| tree | 2f46b8a3e84e07b51b20c70065c8a1c26ad47fd5 /Source/cmFindPackageCommand.h | |
| parent | 544d0c37742a068fa07b265380315a25af3ae9f3 (diff) | |
| parent | 3d13502c986e43f070366d04891c8a3da05e2cb8 (diff) | |
| download | CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.zip CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.tar.gz CMake-9bcaff02ff066e9bdd69e3e1e3134aa65c53c121.tar.bz2 | |
Merge branch 'cmake-guiRememberAdvancedCheckbox' into dev/strict-mode
Conflicts:
Source/QtDialog/CMakeSetupDialog.cxx
Diffstat (limited to 'Source/cmFindPackageCommand.h')
| -rw-r--r-- | Source/cmFindPackageCommand.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index 53ea4fc..57aeab9 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,9 @@ private: std::vector<std::string> Names; std::vector<std::string> Configs; std::set<std::string> IgnoredPaths; + + struct ConfigFileInfo { std::string filename; std::string version; }; + std::vector<ConfigFileInfo> ConsideredConfigs; }; #endif |