diff options
author | Brad King <brad.king@kitware.com> | 2008-01-29 01:38:48 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-01-29 01:38:48 (GMT) |
commit | 41c2895b7524cc4dc60225044a6bba99e0c048ab (patch) | |
tree | 55c46e2b65be4069f3f7d4a01646df32d67af0b1 /Source/cmFindPackageCommand.h | |
parent | 404db8811e4d6dc8ed89f4b1e3efafbb5985dc44 (diff) | |
download | CMake-41c2895b7524cc4dc60225044a6bba99e0c048ab.zip CMake-41c2895b7524cc4dc60225044a6bba99e0c048ab.tar.gz CMake-41c2895b7524cc4dc60225044a6bba99e0c048ab.tar.bz2 |
ENH: Added version support to Config mode of find_package command.
- Added EXACT option to request an exact version.
- Enforce version using check provided by package.
- Updated FindPackageTest to test versioning in config mode.
Diffstat (limited to 'Source/cmFindPackageCommand.h')
-rw-r--r-- | Source/cmFindPackageCommand.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h index 53d749c..5581651 100644 --- a/Source/cmFindPackageCommand.h +++ b/Source/cmFindPackageCommand.h @@ -80,12 +80,16 @@ private: bool FindFrameworkConfig(); bool FindAppBundleConfig(); bool ReadListFile(const char* f); + void StoreVersionFound(); void AddUserPath(std::string const& p); void ComputePrefixes(); bool SearchDirectory(std::string const& dir); bool CheckDirectory(std::string const& dir); bool FindConfigFile(std::string const& dir, std::string& file); + bool FindConfigFileToLoad(std::string const& dir, std::string& file); + bool CheckVersion(std::string const& config_file); + bool CheckVersionFile(std::string const& version_file); bool SearchPrefix(std::string const& prefix); bool SearchFrameworkPrefix(std::string const& prefix_in); bool SearchAppBundlePrefix(std::string const& prefix_in); @@ -100,7 +104,13 @@ private: unsigned int VersionMinor; unsigned int VersionPatch; unsigned int VersionCount; + bool VersionExact; cmStdString FileFound; + cmStdString VersionFound; + unsigned int VersionFoundMajor; + unsigned int VersionFoundMinor; + unsigned int VersionFoundPatch; + unsigned int VersionFoundCount; bool Quiet; bool Required; bool Compatibility_1_6; |