summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-06-11 13:04:26 (GMT)
committerBrad King <brad.king@kitware.com>2009-06-11 13:04:26 (GMT)
commit8ddfd1ed7f3cb6647fa679e240675d7065933e7c (patch)
tree5269de9126241f8e69d66aba6cb7b4598daf45e2 /Utilities
parentf68c6af51e72f90762d83e3e0f3e45b685fec982 (diff)
downloadCMake-8ddfd1ed7f3cb6647fa679e240675d7065933e7c.zip
CMake-8ddfd1ed7f3cb6647fa679e240675d7065933e7c.tar.gz
CMake-8ddfd1ed7f3cb6647fa679e240675d7065933e7c.tar.bz2
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.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmThirdParty.h.in1
-rw-r--r--Utilities/cm_curl.h6
2 files changed, 1 insertions, 6 deletions
diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in
index 0133428..845a1bd 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 bc21192..0fcb5c5 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