[Cmake-commits] [cmake-commits] king committed cmThirdParty.h.in 1.2 1.3 cm_curl.h 1.3 1.4

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities
In directory public:/mounts/ram/cvs-serv13914/Utilities

Modified Files:
	cmThirdParty.h.in cm_curl.h 
Log Message:
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.


Index: cm_curl.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cm_curl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cm_curl.h	29 Sep 2008 20:09:26 -0000	1.3
--- cm_curl.h	11 Jun 2009 13:04:26 -0000	1.4
***************
*** 23,31 ****
  # 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
  #endif
  
--- 23,27 ----
  # include <curl/curl.h>
  #else
! # include <cmcurl/curl/curl.h>
  #endif
  

Index: cmThirdParty.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmThirdParty.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** cmThirdParty.h.in	29 Sep 2008 19:47:46 -0000	1.2
--- cmThirdParty.h.in	11 Jun 2009 13:04:26 -0000	1.3
***************
*** 23,27 ****
  #cmakedefine CMAKE_USE_SYSTEM_XMLRPC
  #cmakedefine CMAKE_USE_SYSTEM_ZLIB
- #cmakedefine CMAKE_USE_NEW_CURL
  
  #endif
--- 23,26 ----