[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5699-ge418250

[Nils Gladitz]

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  e418250146307d878c035733038c7c2b566bd759 (commit)
       via  5bc64440e16206e14999b04e4594b9d8ec79a335 (commit)
      from  fcaad8f603e9497116a480ae537d5cea31d84672 (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=e418250146307d878c035733038c7c2b566bd759
commit e418250146307d878c035733038c7c2b566bd759
Merge: fcaad8f 5bc6444
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Sat Nov 23 08:58:19 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 23 08:58:19 2013 -0500

    Merge topic 'make-cpack-options-boolean' into next
    
    5bc6444 CPack: use IsOn instead of IsSet for boolean CPack options


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bc64440e16206e14999b04e4594b9d8ec79a335
commit 5bc64440e16206e14999b04e4594b9d8ec79a335
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Nov 19 23:52:39 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Nov 19 23:52:39 2013 +0100

    CPack: use IsOn instead of IsSet for boolean CPack options
    
    The CPackComponent macros specifically set CPack options to FALSE
    which CPack previously interpreted to mean "true".

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 5475c2f..cd2fcc7 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -580,7 +580,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
        *      (this works at CPack time too)
        */
       if (this->SupportsComponentInstallation() &
-          !(this->IsSet("CPACK_MONOLITHIC_INSTALL")))
+          !(this->IsOn("CPACK_MONOLITHIC_INSTALL")))
         {
         // Determine the installation types for this project (if provided).
         std::string installTypesVar = "CPACK_"
@@ -1532,13 +1532,13 @@ cmCPackGenerator::GetComponent(const char *projectName, const char *name)
       component->DisplayName = component->Name;
       }
     component->IsHidden
-      = this->IsSet((macroPrefix + "_HIDDEN").c_str());
+      = this->IsOn((macroPrefix + "_HIDDEN").c_str());
     component->IsRequired
-      = this->IsSet((macroPrefix + "_REQUIRED").c_str());
+      = this->IsOn((macroPrefix + "_REQUIRED").c_str());
     component->IsDisabledByDefault
-      = this->IsSet((macroPrefix + "_DISABLED").c_str());
+      = this->IsOn((macroPrefix + "_DISABLED").c_str());
     component->IsDownloaded
-      = this->IsSet((macroPrefix + "_DOWNLOADED").c_str())
+      = this->IsOn((macroPrefix + "_DOWNLOADED").c_str())
         || cmSystemTools::IsOn(this->GetOption("CPACK_DOWNLOAD_ALL"));
 
     const char* archiveFile = this->GetOption((macroPrefix +
@@ -1635,9 +1635,9 @@ cmCPackGenerator::GetComponentGroup(const char *projectName, const char *name)
       group->Description = description;
       }
     group->IsBold
-      = this->IsSet((macroPrefix + "_BOLD_TITLE").c_str());
+      = this->IsOn((macroPrefix + "_BOLD_TITLE").c_str());
     group->IsExpandedByDefault
-      = this->IsSet((macroPrefix + "_EXPANDED").c_str());
+      = this->IsOn((macroPrefix + "_EXPANDED").c_str());
     const char* parentGroupName
       = this->GetOption((macroPrefix + "_PARENT_GROUP").c_str());
     if (parentGroupName && *parentGroupName)

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake