diff options
| author | Brad King <brad.king@kitware.com> | 2009-06-11 09:04:26 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-06-11 09:04:26 -0400 |
| commit | 8ddfd1ed7f3cb6647fa679e240675d7065933e7c (patch) | |
| tree | 5269de9126241f8e69d66aba6cb7b4598daf45e2 | |
| parent | f68c6af51e72f90762d83e3e0f3e45b685fec982 (diff) | |
| download | cmake-8ddfd1ed7f3cb6647fa679e240675d7065933e7c.tar.gz | |
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.
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Utilities/cmThirdParty.h.in | 1 | ||||
| -rw-r--r-- | Utilities/cm_curl.h | 6 |
3 files changed, 2 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6675d4950a..95a9f9a015 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) #--------------------------------------------------------------------- diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in index 0133428c95..845a1bd5f1 100644 --- a/Utilities/cmThirdParty.h.in +++ b/Utilities/cmThirdParty.h.in @@ -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 diff --git a/Utilities/cm_curl.h b/Utilities/cm_curl.h index bc21192cdb..0fcb5c5142 100644 --- a/Utilities/cm_curl.h +++ b/Utilities/cm_curl.h @@ -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 |