[Cmake-commits] CMake branch, next, updated. v3.0.0-3904-gf185f97

[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  f185f975ffd13411c4c666f1531f8675d2c4a8c1 (commit)
       via  3bae343f62e050da78476811234e1f8a055f5d04 (commit)
      from  507e4bb43abfab9578ce6b019d5cd25c4cff55da (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=f185f975ffd13411c4c666f1531f8675d2c4a8c1
commit f185f975ffd13411c4c666f1531f8675d2c4a8c1
Merge: 507e4bb 3bae343
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 09:19:13 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 09:19:13 2014 -0400

    Merge topic 'stringapi-crash-cleanup' into next
    
    3bae343f cmCPackGenerator: Avoid crash on undefined CMAKE_MAKE_PROGRAM


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bae343f62e050da78476811234e1f8a055f5d04
commit 3bae343f62e050da78476811234e1f8a055f5d04
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 09:13:53 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 09:18:27 2014 -0400

    cmCPackGenerator: Avoid crash on undefined CMAKE_MAKE_PROGRAM
    
    Since commit 6557382d (stringapi: Use strings for program
    paths, 2014-02-24), cmGlobalGenerator::GenerateBuildCommand
    takes the make program path as a std::string.  Fix the lookup
    in cmCPackGenerator::InstallProjectViaInstallCMakeProjects to
    use GetSafeDefinition for CMAKE_MAKE_PROGRAM to avoid possible
    construction of std::string from a NULL.
    
    Reported-by: Richard Wirth <richard at califax.de>

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 91f92c5..9336bed 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -637,8 +637,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
       if ( globalGenerator->GetPreinstallTargetName() )
         {
         globalGenerator->FindMakeProgram(this->MakefileMap);
-        const char* cmakeMakeProgram
-          = this->MakefileMap->GetDefinition("CMAKE_MAKE_PROGRAM");
+        std::string cmakeMakeProgram
+          = this->MakefileMap->GetSafeDefinition("CMAKE_MAKE_PROGRAM");
         std::vector<std::string> buildCommand;
         globalGenerator->GenerateBuildCommand(buildCommand, cmakeMakeProgram,
             installProjectName, installDirectory,

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

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


hooks/post-receive
-- 
CMake