Merge topic 'cpack_invalid_cmake_generator'

f89e41c3 CPack invalid CMake generator
This commit is contained in:
Brad King 2015-01-08 14:58:01 -05:00 committed by CMake Topic Stage
commit 0042ad9748
1 changed files with 8 additions and 0 deletions

View File

@ -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.