summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorZach Mullen <zach.mullen@kitware.com>2009-12-21 21:42:32 (GMT)
committerZach Mullen <zach.mullen@kitware.com>2009-12-21 21:42:32 (GMT)
commit5aad7bf2d4d9c5fdf15e56c943ca66986e9e68e9 (patch)
tree522b51f5364e1bffd0152a064911cf33f9d88926 /Source
parentc424267cc1c4462554f4f99387a8a3347ea593a2 (diff)
downloadCMake-5aad7bf2d4d9c5fdf15e56c943ca66986e9e68e9.zip
CMake-5aad7bf2d4d9c5fdf15e56c943ca66986e9e68e9.tar.gz
CMake-5aad7bf2d4d9c5fdf15e56c943ca66986e9e68e9.tar.bz2
Make new web api safe for bootstrap build.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmCTest.cxx4
-rw-r--r--Source/cmSystemTools.cxx2
-rw-r--r--Source/cmSystemTools.h24
3 files changed, 18 insertions, 12 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index d886f4b..01f5836 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -320,6 +320,7 @@ bool cmCTest::ShouldCompressTestOutput()
//----------------------------------------------------------------------------
std::string cmCTest::GetCDashVersion()
{
+#ifdef CMAKE_BUILD_WITH_CMAKE
//First query the server. If that fails, fall back to the local setting
std::string response;
std::string url = "http://";
@@ -328,6 +329,9 @@ std::string cmCTest::GetCDashVersion()
int res = cmSystemTools::HTTPRequest(url, cmSystemTools::HTTP_GET, response);
return res ? this->GetCTestConfiguration("CDashVersion") : response;
+#else
+ return this->GetCTestConfiguration("CDashVersion");
+#endif
}
//----------------------------------------------------------------------------
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 5a0dafc..b5cd1ab 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2942,6 +2942,7 @@ HTTPResponseCallback(void *ptr, size_t size, size_t nmemb, void *data)
return realsize;
}
+#ifdef CMAKE_BUILD_WITH_CMAKE
//----------------------------------------------------------------------------
int cmSystemTools::HTTPRequest(std::string url, HTTPMethod method,
std::string& response,
@@ -2977,3 +2978,4 @@ int cmSystemTools::HTTPRequest(std::string url, HTTPMethod method,
return static_cast<int>(res);
}
+#endif
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index ae397e9..7bdc14f 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -46,18 +46,6 @@ public:
static void ExpandRegistryValues(std::string& source,
KeyWOW64 view = KeyWOW64_Default);
- enum HTTPMethod {
- HTTP_GET,
- HTTP_POST
- };
-
- /**
- * Perform an HTTP request.
- */
- static int HTTPRequest(std::string url, HTTPMethod method,
- std::string& response,
- std::string fields = "", int timeout = 10);
-
/**
* Platform independent escape spaces, unix uses backslash,
* windows double quotes the string.
@@ -354,6 +342,18 @@ public:
static std::string RelativePath(const char* local, const char* remote);
#ifdef CMAKE_BUILD_WITH_CMAKE
+ enum HTTPMethod {
+ HTTP_GET,
+ HTTP_POST
+ };
+
+ /**
+ * Perform an HTTP request.
+ */
+ static int HTTPRequest(std::string url, HTTPMethod method,
+ std::string& response,
+ std::string fields = "", int timeout = 10);
+
/** Remove an environment variable */
static bool UnsetEnv(const char* value);