[Cmake-commits] CMake branch, next, updated. v3.1.0-1513-gb9196b9

[Domen Vrankar]

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  b9196b94711e082704fa775db5edc8688644e14a (commit)
       via  f89e41c3e7c6d47dd26a47e3543ada2301db7521 (commit)
      from  b5f5b58d179e6ce8fcb783ab0d5bcbc2a7dc62ee (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=b9196b94711e082704fa775db5edc8688644e14a
commit b9196b94711e082704fa775db5edc8688644e14a
Merge: b5f5b58 f89e41c
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Jan 7 14:36:39 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 7 14:36:39 2015 -0500

    Merge topic 'cpack_invalid_cmake_generator' into next
    
    f89e41c3 CPack invalid CMake generator


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f89e41c3e7c6d47dd26a47e3543ada2301db7521
commit f89e41c3e7c6d47dd26a47e3543ada2301db7521
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Jan 2 10:46:08 2015 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Jan 2 10:46:08 2015 +0100

    CPack invalid CMake generator
    
    Case where CPACK_CMAKE_GENERATOR value is non existent or
    or contains multiple words that were not quoted was not
    handled and produced a segmentation fault.

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index e78f161..2330278 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -628,6 +628,14 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
       cmGlobalGenerator* globalGenerator
         = this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator(
           cmakeGenerator);
+      if ( !globalGenerator )
+      {
+      cmCPackLogger(cmCPackLog::LOG_ERROR,
+                    "Specified package generator not found. "
+                    "CPACK_CMAKE_GENERATOR value is invalid."
+                    << std::endl);
+      return 0;
+      }
       // set the global flag for unix style paths on cmSystemTools as
       // soon as the generator is set.  This allows gmake to be used
       // on windows.

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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake