diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Source/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestSubmitHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 2 | ||||
| -rw-r--r-- | Utilities/cmxmlrpc/xmlrpc_curl_transport.c | 6 |
5 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b06b2b6..8f8327e 100644 --- a/CMakeLists.txt +++ b/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. diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index bb8f0a4..b7265ed 100644 --- a/Source/CMakeLists.txt +++ b/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 diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 3fd27b1..32eff81 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/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> diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 1d4ac21..e7017c5 100644 --- a/Source/cmCTest.cxx +++ b/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" diff --git a/Utilities/cmxmlrpc/xmlrpc_curl_transport.c b/Utilities/cmxmlrpc/xmlrpc_curl_transport.c index d617f66..1190908 100644 --- a/Utilities/cmxmlrpc/xmlrpc_curl_transport.c +++ b/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> |