diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-27 13:42:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-27 13:42:44 (GMT) |
| commit | 4fc453c420064b0584b668ce42965fb31dd9ed09 (patch) | |
| tree | 557e91ec2b39082d09b6a4b9bd0158ea23dbae94 | |
| parent | 3138da6e675102af8bd81e8715abc7a57806377f (diff) | |
| parent | 3bae343f62e050da78476811234e1f8a055f5d04 (diff) | |
| download | CMake-4fc453c420064b0584b668ce42965fb31dd9ed09.zip CMake-4fc453c420064b0584b668ce42965fb31dd9ed09.tar.gz CMake-4fc453c420064b0584b668ce42965fb31dd9ed09.tar.bz2 | |
Merge topic 'stringapi-crash-cleanup'
3bae343f cmCPackGenerator: Avoid crash on undefined CMAKE_MAKE_PROGRAM
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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, |