diff options
| author | Brad King <brad.king@kitware.com> | 2010-08-19 17:28:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-08-19 17:28:08 (GMT) |
| commit | 9b02aee86e99c48ec4eee085c90155c31328a38d (patch) | |
| tree | 15b0c74474cb03ec0345ddf876cfdfcd997435d7 | |
| parent | 0ea9d650f7103774825338df3ced17acd081dace (diff) | |
| parent | 7dbc1a2ebd140461c2478e6fdd54eb919f66c25d (diff) | |
| download | CMake-9b02aee86e99c48ec4eee085c90155c31328a38d.zip CMake-9b02aee86e99c48ec4eee085c90155c31328a38d.tar.gz CMake-9b02aee86e99c48ec4eee085c90155c31328a38d.tar.bz2 | |
Merge topic 'fix-cdash-version-uri'
7dbc1a2 Fix hard-coded CDash URI in version query
| -rw-r--r-- | Source/cmCTest.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 3a777d5..d12fde0 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -410,10 +410,14 @@ std::string cmCTest::GetCDashVersion() //First query the server. If that fails, fall back to the local setting std::string response; std::string url = "http://"; - url += this->GetCTestConfiguration("DropSite") + "/CDash/api/getversion.php"; - + url += this->GetCTestConfiguration("DropSite"); + + 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); - + return res ? this->GetCTestConfiguration("CDashVersion") : response; #else return this->GetCTestConfiguration("CDashVersion"); |