ENH: Move curl to utilities

CMakeLists.txt

@@ -74,9 +74,9 @@ SET(CURL_SPECIAL_ZLIB_H "cmzlib/zlib.h")
 
 #-----------------------------------------------------------------------------
 # Build Curl library for CTest.
-SUBDIRS(Source/CTest/Curl)
-SET(CMAKE_CURL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Source/CTest/Curl")
-SET(CMAKE_CURL_LIBRARIES "Curl")
+SUBDIRS(Utilities/cmcurl)
+SET(CMAKE_CURL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Utilities")
+SET(CMAKE_CURL_LIBRARIES "cmcurl")
 
 #-----------------------------------------------------------------------------
 # Build expat library for CMake and CTest.

Source/CMakeLists.txt

@@ -198,6 +198,7 @@ ENDIF(CMAKE_BUILD_ON_VISUAL_STUDIO)
 INCLUDE_DIRECTORIES(
   "${CMAKE_SOURCE_DIR}/Source/CTest"
   ${CMAKE_XMLRPC_INCLUDES}
+  ${CMAKE_CURL_INCLUDES}
   )
 #
 # Sources for CTestLib

Source/CTest/cmCTestSubmitHandler.cxx

@@ -29,7 +29,7 @@ PURPOSE.  See the above copyright notices for more information.
 #include "xmlrpc_client.h"
 
 // For curl submission
-#include "CTest/Curl/curl/curl.h"
+#include "cmcurl/curl/curl.h"
 
 #include <sys/stat.h>
 

Source/cmCTest.cxx

@@ -14,7 +14,7 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "CTest/Curl/curl/curl.h"
+#include "cmcurl/curl/curl.h"
 
 #include "cmCTest.h"
 #include "cmake.h"

Utilities/cmxmlrpc/xmlrpc_curl_transport.c

@@ -27,9 +27,9 @@
 #  include "xmlrpc_pthreads.h"
 #endif
 
-#include <curl/curl.h>
-#include <curl/types.h>
-#include <curl/easy.h>
+#include <cmcurl/curl/curl.h>
+#include <cmcurl/curl/types.h>
+#include <cmcurl/curl/easy.h>
 
 #ifndef WIN32
 #  include <unistd.h>