Merge topic 'ctest-no-cdash-issue-12618'

52f937a CTest: Do not get CDash version without drop site (#12618)
This commit is contained in:
David Cole
2011-12-16 10:13:12 -05:00
committed by CMake Topic Stage
+6 -2
View File
@@ -440,8 +440,12 @@ std::string cmCTest::GetCDashVersion()
std::string cdashUri = this->GetCTestConfiguration("DropLocation");
cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php"));
url += cdashUri + "/api/getversion.php";
int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
int res = 1;
if ( ! cdashUri.empty() )
{
url += cdashUri + "/api/getversion.php";
res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
}
return res ? this->GetCTestConfiguration("CDashVersion") : response;
#else