summaryrefslogtreecommitdiffstats
path: root/Source/cmFindPackageCommand.cxx
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-08-02 19:09:41 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-08-02 19:09:41 (GMT)
commit2c7b38afa6e941166501dfed47e6b22b1847b9ab (patch)
tree3960e6ab30b443e666eabb94bc55c98e6e718072 /Source/cmFindPackageCommand.cxx
parentd8c1b44790ee2d6fce56c327e639407456f6c61c (diff)
parentb62349cc60d71eb2af5648eb6867678d5b05273b (diff)
downloadCMake-2c7b38afa6e941166501dfed47e6b22b1847b9ab.zip
CMake-2c7b38afa6e941166501dfed47e6b22b1847b9ab.tar.gz
CMake-2c7b38afa6e941166501dfed47e6b22b1847b9ab.tar.bz2
Merge topic 'FeatureSummaryImprovements'
b62349c FeatureSummary.cmake: update documentation f366cf8 FeatureSummary.cmake: cosmetics f407bb5 FeatureSummary.cmake: only higher TYPEs can override previous TYPEs 02d47ab FeatureSummary.cmake: error out when a REQUIRED package is missing 91a1527 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword 0671a02 FeatureSummary.cmake: remove "comment" field aae13f4 Extend FeatureSummary: add PURPOSE of package and TYPE
Diffstat (limited to 'Source/cmFindPackageCommand.cxx')
-rw-r--r--Source/cmFindPackageCommand.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 9d1c220..5aed5e2 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1196,20 +1196,20 @@ void cmFindPackageCommand::AppendSuccessInformation()
if ((cmSystemTools::IsOn(result)) || (cmSystemTools::IsOn(upperResult)))
{
this->AppendToProperty("PACKAGES_FOUND");
- if (!this->Quiet)
- {
- this->AppendToProperty("ENABLED_FEATURES");
- }
}
else
{
this->AppendToProperty("PACKAGES_NOT_FOUND");
- if (!this->Quiet)
- {
- this->AppendToProperty("DISABLED_FEATURES");
- }
}
+ // Record whether the find was quiet or not, so this can be used
+ // e.g. in FeatureSummary.cmake
+ std::string quietInfoPropName = "_CMAKE_";
+ quietInfoPropName += this->Name;
+ quietInfoPropName += "_QUIET";
+ this->Makefile->GetCMakeInstance()->SetProperty(quietInfoPropName.c_str(),
+ this->Quiet ? "TRUE" : "FALSE");
+
// set a global property to record the required version of this package
std::string versionInfoPropName = "_CMAKE_";
versionInfoPropName += this->Name;