diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-08 19:58:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-01-08 19:58:01 (GMT) |
| commit | 0042ad97480a236cd748f7d5aebc70ff21e75513 (patch) | |
| tree | 3034c86ffef5acb4bd0d15406c4662d7a62fdac2 | |
| parent | c1c1fcb17cb2a4dbd408ac7f1b9a962966eb3939 (diff) | |
| parent | f89e41c3e7c6d47dd26a47e3543ada2301db7521 (diff) | |
| download | CMake-0042ad97480a236cd748f7d5aebc70ff21e75513.zip CMake-0042ad97480a236cd748f7d5aebc70ff21e75513.tar.gz CMake-0042ad97480a236cd748f7d5aebc70ff21e75513.tar.bz2 | |
Merge topic 'cpack_invalid_cmake_generator'
f89e41c3 CPack invalid CMake generator
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
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. |