diff options
author | Alex Neundorf <neundorf@kde.org> | 2011-07-17 15:48:00 (GMT) |
---|---|---|
committer | Alex Neundorf <neundorf@kde.org> | 2011-07-17 15:48:00 (GMT) |
commit | 91a1527735c8d4f598a1836b1cc8ba128936712e (patch) | |
tree | 59721b01a741ea36d8c95b267d190af07538dbdb /Source | |
parent | 0671a029205763845e5fd21ce5f69fbe8b0b2c45 (diff) | |
download | CMake-91a1527735c8d4f598a1836b1cc8ba128936712e.zip CMake-91a1527735c8d4f598a1836b1cc8ba128936712e.tar.gz CMake-91a1527735c8d4f598a1836b1cc8ba128936712e.tar.bz2 |
FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword
Now found packages are not stored in ENABLED/DISABLED_FEATURES
anymore, but always in PACKAGES_FOUND/NOT_FOUND.
ENABLED/DISABLED_FEATURES is now only used via
ADD_FEATURE_INFO(), e.g. for stuff set via option().
Alex
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmFindPackageCommand.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 5f106bc..5641abc 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -1174,20 +1174,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; |