[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-919-ge5d3d2a

[Brad King]

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  e5d3d2a8723f304cd5f4b7008df60e2b2bd7df69 (commit)
       via  ad5c76af6460dad1fcdcd401ac9d2275663af445 (commit)
      from  909239eba626468e8842303a06f2b12c19606a59 (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=e5d3d2a8723f304cd5f4b7008df60e2b2bd7df69
commit e5d3d2a8723f304cd5f4b7008df60e2b2bd7df69
Merge: 909239e ad5c76a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 8 16:07:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 8 16:07:25 2015 -0400

    Merge topic 'cpack-ifw-framework-version' into next
    
    ad5c76af CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad5c76af6460dad1fcdcd401ac9d2275663af445
commit ad5c76af6460dad1fcdcd401ac9d2275663af445
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Wed Jul 8 20:23:34 2015 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 8 16:02:03 2015 -0400

    CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION
    
    This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1
    (CPackIFW: Add QtIFW 2.0 support, 2015-04-27).  We need to load the
    CPackIFW module to initialize it if it is not set.

diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
index 80ba068..09e123c 100644
--- a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
@@ -254,9 +254,11 @@ int cmCPackIFWGenerator::InitializeInternal()
 
   const std::string BinCreatorOpt = "CPACK_IFW_BINARYCREATOR_EXECUTABLE";
   const std::string RepoGenOpt = "CPACK_IFW_REPOGEN_EXECUTABLE";
+  const std::string FrameworkVersionOpt = "CPACK_IFW_FRAMEWORK_VERSION";
 
   if(!this->IsSet(BinCreatorOpt) ||
-     !this->IsSet(RepoGenOpt))
+     !this->IsSet(RepoGenOpt) ||
+     !this->IsSet(FrameworkVersionOpt))
     {
     this->ReadListFile("CPackIFW.cmake");
     }
@@ -296,7 +298,7 @@ int cmCPackIFWGenerator::InitializeInternal()
 
   // Framework version
   if(const char* FrameworkVersionSrt =
-      this->GetOption("CPACK_IFW_FRAMEWORK_VERSION"))
+      this->GetOption(FrameworkVersionOpt))
     {
     FrameworkVersion = FrameworkVersionSrt;
     }

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

Summary of changes:
 Source/CPack/IFW/cmCPackIFWGenerator.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake