This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b32ebc8d65e76d77a354e0666fe6261082789dbc (commit)
via 7041cd6a884d96941af0ac7aad442a83618aff71 (commit)
via 731d61d8d9119417e5cc0b10ef167183d137cb00 (commit)
from 735ecd93351f9a3fbea7eb6884e264256b98af8e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b32ebc8d65e76d77a354e0666fe6261082789dbc
commit b32ebc8d65e76d77a354e0666fe6261082789dbc
Merge: 735ecd9 7041cd6
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 14 07:46:51 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 14 07:46:51 2011 -0400
Merge topic 'fix-12517-ctest-crash' into next
7041cd6 CTest: Fix crash when variables are not defined
731d61d KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7041cd6a884d96941af0ac7aad442a83618aff71
commit 7041cd6a884d96941af0ac7aad442a83618aff71
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 14 07:46:01 2011 -0400
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Oct 14 07:46:01 2011 -0400
CTest: Fix crash when variables are not defined
Avoiding dereference of NULL pointers is always good.
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() )
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestConfigureCommand.cxx | 4 ++--
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake