[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.149 1.150

[cmake-commits at cmake.org]

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

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/CMakeLists.txt,v
retrieving revision 1.149
retrieving revision 1.150
diff -C 2 -d -r1.149 -r1.150
*** CMakeLists.txt	5 Mar 2009 20:17:06 -0000	1.149
--- CMakeLists.txt	10 Apr 2009 15:59:31 -0000	1.150
***************
*** 267,271 ****
      SET(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES})
      SET(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES})
!     ADD_DEFINITIONS(-DCURL_STATICLIB)
      SET(CMAKE_CURL_INCLUDES)
      SET(CMAKE_CURL_LIBRARIES cmcurl)
--- 267,274 ----
      SET(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES})
      SET(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES})
!     OPTION(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" FALSE)
!     IF(NOT CMAKE_BUILD_CURL_SHARED)
!       ADD_DEFINITIONS(-DCURL_STATICLIB)
!     ENDIF(NOT CMAKE_BUILD_CURL_SHARED)
      SET(CMAKE_CURL_INCLUDES)
      SET(CMAKE_CURL_LIBRARIES cmcurl)