kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-build-crash-on-bad-generator' into release

This commit is contained in:
Brad King 2014-06-03 11:53:18 -04:00
parent 687e0d6319 44e2923f33
commit 695ce68419
10 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmake.cxx
View File

@ -2667,11 +2667,17 @@ int cmake::Build(const std::string& dir,
}
if(!it.Find("CMAKE_GENERATOR"))
{
std::cerr << "Error: could find generator in Cache\n";
std::cerr << "Error: could not find CMAKE_GENERATOR in Cache\n";
return 1;
}
cmsys::auto_ptr<cmGlobalGenerator> gen(
this->CreateGlobalGenerator(it.GetValue()));
if(!gen.get())
{
std::cerr << "Error: could create CMAKE_GENERATOR \""
<< it.GetValue() << "\"\n";
return 1;
}
std::string output;
std::string projName;
if(!it.Find("CMAKE_PROJECT_NAME"))

7
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@ -1,5 +1,12 @@
include(RunCMake)
run_cmake_command(build-no-cache
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR})
run_cmake_command(build-no-generator
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-no-generator)
run_cmake_command(build-bad-generator
${CMAKE_COMMAND} --build ${RunCMake_SOURCE_DIR}/cache-bad-generator)
if(UNIX)
run_cmake_command(E_create_symlink-missing-dir
${CMAKE_COMMAND} -E create_symlink T missing-dir/L

1
Tests/RunCMake/CommandLine/build-bad-generator-result.txt Normal file
View File

@ -0,0 +1 @@
1

1
Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt Normal file
View File

@ -0,0 +1 @@
^Error: could create CMAKE_GENERATOR "Bad Generator"$

1
Tests/RunCMake/CommandLine/build-no-cache-result.txt Normal file
View File

@ -0,0 +1 @@
1

1
Tests/RunCMake/CommandLine/build-no-cache-stderr.txt Normal file
View File

@ -0,0 +1 @@
^Error: could not load cache$

1
Tests/RunCMake/CommandLine/build-no-generator-result.txt Normal file
View File

@ -0,0 +1 @@
1

1
Tests/RunCMake/CommandLine/build-no-generator-stderr.txt Normal file
View File

@ -0,0 +1 @@
^Error: could not find CMAKE_GENERATOR in Cache$

1
Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt Normal file
View File

@ -0,0 +1 @@
CMAKE_GENERATOR:INTERNAL=Bad Generator

0
Tests/RunCMake/CommandLine/cache-no-generator/CMakeCache.txt Normal file
View File