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

Merge topic 'fix-12517-ctest-crash'

Browse Source 
7041cd6 CTest: Fix crash when variables are not defined
This commit is contained in:
David Cole 2011-10-18 15:04:05 -04:00 committed by CMake Topic Stage
commit 1322c416dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/CTest/cmCTestConfigureCommand.cxx
View File

@ -41,7 +41,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
{ {
this->CTest->SetCTestConfiguration("BuildDirectory", this->CTest->SetCTestConfiguration("BuildDirectory",
cmSystemTools::CollapseFullPath( cmSystemTools::CollapseFullPath(
this->Makefile->GetDefinition("CTEST_BINARY_DIRECTORY")).c_str()); this->Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY")).c_str());
} }
if ( this->Values[ct_SOURCE] ) if ( this->Values[ct_SOURCE] )
@ -54,7 +54,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler()
{ {
this->CTest->SetCTestConfiguration("SourceDirectory", this->CTest->SetCTestConfiguration("SourceDirectory",
cmSystemTools::CollapseFullPath( cmSystemTools::CollapseFullPath(
this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY")).c_str()); this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY")).c_str());
} }
if ( this->CTest->GetCTestConfiguration("BuildDirectory").empty() ) if ( this->CTest->GetCTestConfiguration("BuildDirectory").empty() )