[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.22 1.23

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: allow for shared build of libcurl and fix build with openssl option (ssl tested on linux and windows


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** CMakeLists.txt	26 Nov 2008 21:19:27 -0000	1.22
--- CMakeLists.txt	10 Apr 2009 15:59:31 -0000	1.23
***************
*** 181,189 ****
  ENDIF(NOT CURL_SPECIAL_LIBZ)
  
! OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ON)
  MARK_AS_ADVANCED(CMAKE_USE_OPENSSL)
  IF(CMAKE_USE_OPENSSL)
!   CHECK_LIBRARY_EXISTS_CONCAT("crypto" CRYPTO_lock  HAVE_LIBCRYPTO)
!   CHECK_LIBRARY_EXISTS_CONCAT("ssl"    SSL_connect  HAVE_LIBSSL)
  ENDIF(CMAKE_USE_OPENSSL)
  
--- 181,200 ----
  ENDIF(NOT CURL_SPECIAL_LIBZ)
  
! OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code." OFF)
  MARK_AS_ADVANCED(CMAKE_USE_OPENSSL)
  IF(CMAKE_USE_OPENSSL)
!   SET(USE_SSLEAY TRUE)
!   SET(USE_OPENSSL TRUE)
!   IF(WIN32)
!     FIND_PATH(SSLINCLUDE openssl/crypto.h 
!       PATHS c:/hoffman/Tools/openssl_w32vc6-0.9.8g/inc32)
!     INCLUDE_DIRECTORIES(${SSLINCLUDE})
!     FIND_LIBRARY(LIBEAY NAMES libeay32)
!     FIND_LIBRARY(SSLEAY NAMES ssleay32)
!     SET(CURL_LIBS  ${CURL_LIBS} ${LIBEAY} ${SSLEAY} )
!   ELSE(WIN32)
!     CHECK_LIBRARY_EXISTS_CONCAT("crypto" CRYPTO_lock  HAVE_LIBCRYPTO)
!     CHECK_LIBRARY_EXISTS_CONCAT("ssl"    SSL_connect  HAVE_LIBSSL)
!   ENDIF(WIN32)
  ENDIF(CMAKE_USE_OPENSSL)
  
***************
*** 397,400 ****
--- 408,416 ----
  CHECK_SYMBOL_EXISTS(gettimeofday  "${CURL_INCLUDES}" HAVE_GETTIMEOFDAY)
  CHECK_SYMBOL_EXISTS(inet_addr     "${CURL_INCLUDES}" HAVE_INET_ADDR)
+ # windows only has this for vista, but will link with it and say
+ # that it has it at link time!  So, force it off
+ IF(WIN32)
+   SET(HAVE_INET_PTON 0 CACHE "" INTERNAL )
+ ENDIF(WIN32)
  CHECK_SYMBOL_EXISTS(inet_pton     "${CURL_INCLUDES}" HAVE_INET_PTON)
  CHECK_SYMBOL_EXISTS(inet_ntoa     "${CURL_INCLUDES}" HAVE_INET_NTOA)
***************
*** 702,712 ****
  INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
  INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
! ADD_DEFINITIONS(-DHAVE_CONFIG_H
!   -DCURL_STATICLIB)
  CONFIGURE_FILE(${LIBCURL_SOURCE_DIR}/config.h.in
    ${LIBCURL_BINARY_DIR}/config.h)
  
! ADD_LIBRARY(cmcurl ${libCurl_SRCS})
  TARGET_LINK_LIBRARIES(cmcurl ${CURL_LIBS})
  
  OPTION(CURL_TESTING "Do libCurl testing" OFF)
--- 718,741 ----
  INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
  INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
! OPTION(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" TRUE)
! IF(CMAKE_BUILD_CURL_SHARED)
!   SET(LIBRARY_TYPE SHARED)
!   ADD_DEFINITIONS(-DHAVE_CONFIG_H)
! ELSE(CMAKE_BUILD_CURL_SHARED)
!    ADD_DEFINITIONS(-DHAVE_CONFIG_H
!     -DCURL_STATICLIB)
! ENDIF(CMAKE_BUILD_CURL_SHARED)
! SET(CURL_STATICLIB)
  CONFIGURE_FILE(${LIBCURL_SOURCE_DIR}/config.h.in
    ${LIBCURL_BINARY_DIR}/config.h)
  
! 
! ADD_LIBRARY(cmcurl ${LIBRARY_TYPE} ${libCurl_SRCS})
  TARGET_LINK_LIBRARIES(cmcurl ${CURL_LIBS})
+ IF(CMAKE_BUILD_CURL_SHARED)
+   SET_TARGET_PROPERTIES(cmcurl PROPERTIES DEFINE_SYMBOL BUILDING_LIBCURL
+     RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+   INSTALL_TARGETS(/bin cmcurl)
+ ENDIF(CMAKE_BUILD_CURL_SHARED)
  
  OPTION(CURL_TESTING "Do libCurl testing" OFF)