ENH: Remove option to build cmcurl-7.19.0

This version of curl was added experimentally but does not address the
problem we were hoping it fixed (an occasional upload hang).  Importing
a new curl can wait until the problem is fully diagnosed and addressed.
This commit is contained in:
Brad King 2009-06-11 09:04:26 -04:00
parent f68c6af51e
commit 8ddfd1ed7f
3 changed files with 2 additions and 13 deletions

View File

@ -257,13 +257,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
ENDIF(NOT CMAKE_BUILD_CURL_SHARED)
SET(CMAKE_CURL_INCLUDES)
SET(CMAKE_CURL_LIBRARIES cmcurl)
IF(CMAKE_USE_NEW_CURL)
# for cmake never build examples
SET(CURL_SKIP_EXAMPLES TRUE)
ADD_SUBDIRECTORY(Utilities/cmcurl-7.19.0)
ELSE(CMAKE_USE_NEW_CURL)
SUBDIRS(Utilities/cmcurl)
ENDIF(CMAKE_USE_NEW_CURL)
SUBDIRS(Utilities/cmcurl)
ENDIF(CMAKE_USE_SYSTEM_CURL)
#---------------------------------------------------------------------

View File

@ -22,6 +22,5 @@
#cmakedefine CMAKE_USE_SYSTEM_EXPAT
#cmakedefine CMAKE_USE_SYSTEM_XMLRPC
#cmakedefine CMAKE_USE_SYSTEM_ZLIB
#cmakedefine CMAKE_USE_NEW_CURL
#endif

View File

@ -22,11 +22,7 @@
#ifdef CMAKE_USE_SYSTEM_CURL
# include <curl/curl.h>
#else
# ifdef CMAKE_USE_NEW_CURL
# include <cmcurl-7.19.0/include/curl/curl.h>
# else
# include <cmcurl/curl/curl.h>
# endif
# include <cmcurl/curl/curl.h>
#endif
#endif