[Cmake-commits] CMake branch, next, updated. v2.8.7-2566-g5994d9d

Alexander Neundorf neundorf at kde.org
Sat Feb 11 12:22:23 EST 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5994d9dab7647a44d88bc6e7aadee60e379daf9f (commit)
       via  e6c5b9452a0e49d93e775169bb5bf63ea016df5e (commit)
      from  85f3d9ad47f019242cb91478d8142bb79d19dd85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5994d9dab7647a44d88bc6e7aadee60e379daf9f
commit 5994d9dab7647a44d88bc6e7aadee60e379daf9f
Merge: 85f3d9a e6c5b94
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sat Feb 11 12:22:21 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 11 12:22:21 2012 -0500

    Merge topic 'FixFeatureSummaryForREQUIREDPackages' into next
    
    e6c5b94 fix FeatureSummary for REQUIRED packages, they were reported as OPTIONAL


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6c5b9452a0e49d93e775169bb5bf63ea016df5e
commit e6c5b9452a0e49d93e775169bb5bf63ea016df5e
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Feb 11 18:04:26 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Feb 11 18:04:26 2012 +0100

    fix FeatureSummary for REQUIRED packages, they were reported as OPTIONAL
    
    Alex

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();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFindPackageCommand.cxx |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list