summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-02-14 21:17:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-02-14 21:17:07 (GMT)
commit4fd13c0f150f8201b8e8391d743fab86817c978b (patch)
tree23b6d94fe2924bf1ef75e65642d96f97edd552f8
parent16447fa92faf4ef29c4b86ba8b41d62105986a9b (diff)
parente6c5b9452a0e49d93e775169bb5bf63ea016df5e (diff)
downloadCMake-4fd13c0f150f8201b8e8391d743fab86817c978b.zip
CMake-4fd13c0f150f8201b8e8391d743fab86817c978b.tar.gz
CMake-4fd13c0f150f8201b8e8391d743fab86817c978b.tar.bz2
Merge topic 'FixFeatureSummaryForREQUIREDPackages'
e6c5b94 fix FeatureSummary for REQUIRED packages, they were reported as OPTIONAL
-rw-r--r--Source/cmFindPackageCommand.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7d3f09b..22bb628 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1226,6 +1226,15 @@ void cmFindPackageCommand::AppendSuccessInformation()
}
this->Makefile->GetCMakeInstance()->SetProperty(versionInfoPropName.c_str(),
versionInfo.c_str());
+ if (this->Required)
+ {
+ std::string requiredInfoPropName = "_CMAKE_";
+ requiredInfoPropName += this->Name;
+ requiredInfoPropName += "_TYPE";
+ this->Makefile->GetCMakeInstance()->SetProperty(
+ requiredInfoPropName.c_str(), "REQUIRED");
+ }
+
// Restore original state of "_FIND_" variables we set.
this->RestoreFindDefinitions();