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 87c968015515351aacbee47779194e1df43b512e (commit)
via 8bba38161855deaa90fe72057f6cd4564110d551 (commit)
from 56db783f0c5e882d45c6f78f5d46dbf3f1c09ae4 (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=87c968015515351aacbee47779194e1df43b512e
commit 87c968015515351aacbee47779194e1df43b512e
Merge: 56db783 8bba381
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Jan 13 10:59:44 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 13 10:59:44 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
8bba3816 Do not set the options on the handler if they are not used.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bba38161855deaa90fe72057f6cd4564110d551
commit 8bba38161855deaa90fe72057f6cd4564110d551
Author: Bill Hoffman <bill.hoff...@kitware.com>
AuthorDate: Tue Jan 13 10:58:40 2015 -0500
Commit: Bill Hoffman <bill.hoff...@kitware.com>
CommitDate: Tue Jan 13 10:58:40 2015 -0500
Do not set the options on the handler if they are not used.
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx
b/Source/CTest/cmCTestSubmitCommand.cxx
index c608034..dcd7982 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -145,10 +145,13 @@ cmCTestGenericHandler*
cmCTestSubmitCommand::InitializeHandler()
static_cast<cmCTestSubmitHandler*>(handler)->SetOption("InternalTest",
this->InternalTest ? "ON" : "OFF");
- static_cast<cmCTestSubmitHandler*>(handler)->
- SetOption("CDashUploadFile", this->CDashUploadFile.c_str());
- static_cast<cmCTestSubmitHandler*>(handler)->
- SetOption("CDashUploadType", this->CDashUploadType.c_str());
+ if(this->CDashUploadFile.size())
+ {
+ static_cast<cmCTestSubmitHandler*>(handler)->
+ SetOption("CDashUploadFile", this->CDashUploadFile.c_str());
+ static_cast<cmCTestSubmitHandler*>(handler)->
+ SetOption("CDashUploadType", this->CDashUploadType.c_str());
+ }
return handler;
}
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestSubmitCommand.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
