diff options
| author | David Cole <david.cole@kitware.com> | 2011-10-18 19:04:05 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-18 19:04:05 (GMT) |
| commit | 1322c416ddb9a3179ab02da8710ed88dfcaaa431 (patch) | |
| tree | d5d04c897f755c42bfbba1f740f160827bc9f1b1 /Source | |
| parent | c8185891134d7928f685cf068bd8410eb8519731 (diff) | |
| parent | 7041cd6a884d96941af0ac7aad442a83618aff71 (diff) | |
| download | CMake-1322c416ddb9a3179ab02da8710ed88dfcaaa431.zip CMake-1322c416ddb9a3179ab02da8710ed88dfcaaa431.tar.gz CMake-1322c416ddb9a3179ab02da8710ed88dfcaaa431.tar.bz2 | |
Merge topic 'fix-12517-ctest-crash'
7041cd6 CTest: Fix crash when variables are not defined
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestConfigureCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index 9a668bc..7a99ddf 100644 --- a/Source/CTest/cmCTestConfigureCommand.cxx +++ b/Source/CTest/cmCTestConfigureCommand.cxx @@ -41,7 +41,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler() { this->CTest->SetCTestConfiguration("BuildDirectory", cmSystemTools::CollapseFullPath( - this->Makefile->GetDefinition("CTEST_BINARY_DIRECTORY")).c_str()); + this->Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY")).c_str()); } if ( this->Values[ct_SOURCE] ) @@ -54,7 +54,7 @@ cmCTestGenericHandler* cmCTestConfigureCommand::InitializeHandler() { this->CTest->SetCTestConfiguration("SourceDirectory", cmSystemTools::CollapseFullPath( - this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY")).c_str()); + this->Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY")).c_str()); } if ( this->CTest->GetCTestConfiguration("BuildDirectory").empty() ) |