diff options
author | Brad King <brad.king@kitware.com> | 2009-06-11 15:24:56 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-06-11 15:24:56 (GMT) |
commit | 8f5af6172a3f8bbad85ad3495f94e20557942670 (patch) | |
tree | 2273d9f4d89dbcc3ecf472fb917467511ec8d01b /Source/CTest/cmCTestSubmitHandler.cxx | |
parent | 8c5c192b9dff5ad8e7b422ed16935c2c5d2016db (diff) | |
download | CMake-8f5af6172a3f8bbad85ad3495f94e20557942670.zip CMake-8f5af6172a3f8bbad85ad3495f94e20557942670.tar.gz CMake-8f5af6172a3f8bbad85ad3495f94e20557942670.tar.bz2 |
ENH: Disable the xmlrpc drop method by default
We've chosen to drop our default dependence on xmlrpc. Thus we disable
the corresponding CTest submission method and remove the sources for
building xmlrpc locally. Users can re-enable the method by setting the
CTEST_USE_XMLRPC option to use a system-installed xmlrpc library.
Diffstat (limited to 'Source/CTest/cmCTestSubmitHandler.cxx')
-rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 76dc6e6..0c787f5 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -727,6 +727,7 @@ bool cmCTestSubmitHandler::SubmitUsingCP( //---------------------------------------------------------------------------- +#if defined(CTEST_USE_XMLRPC) bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const cmStdString& localprefix, const std::set<cmStdString>& files, const cmStdString& remoteprefix, @@ -824,6 +825,15 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(const cmStdString& localprefix, xmlrpc_client_cleanup(); return true; } +#else +bool cmCTestSubmitHandler::SubmitUsingXMLRPC(cmStdString const&, + std::set<cmStdString> const&, + cmStdString const&, + cmStdString const&) +{ + return false; +} +#endif //---------------------------------------------------------------------------- int cmCTestSubmitHandler::ProcessHandler() @@ -1137,6 +1147,7 @@ int cmCTestSubmitHandler::ProcessHandler() } else if ( dropMethod == "xmlrpc" ) { +#if defined(CTEST_USE_XMLRPC) ofs << "Using drop method: XML-RPC" << std::endl; cmCTestLog(this->CTest, HANDLER_OUTPUT, " Using XML-RPC submit method" << std::endl); @@ -1154,6 +1165,12 @@ int cmCTestSubmitHandler::ProcessHandler() << std::endl); ofs << " Submission successful" << std::endl; return 0; +#else + cmCTestLog(this->CTest, ERROR_MESSAGE, + " Submission method \"xmlrpc\" not compiled into CTest!" + << std::endl); + return -1; +#endif } else if ( dropMethod == "scp" ) { |