kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Move curl to utilities

This commit is contained in:
Andy Cedilnik 2005-06-24 09:06:26 -04:00
parent 7c730973bb
commit b7514580f9
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

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

1
Source/CMakeLists.txt
View File

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

2
Source/CTest/cmCTestSubmitHandler.cxx
View File

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

2
Source/cmCTest.cxx
View File

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

6
Utilities/cmxmlrpc/xmlrpc_curl_transport.c
View File

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