diff options
| author | Benoit Neil <suky0001@free.fr> | 2009-04-06 21:05:44 +0000 |
|---|---|---|
| committer | Benoit Neil <suky0001@free.fr> | 2009-04-06 21:05:44 +0000 |
| commit | b85154f13fa5bf25d7da2fa4eaa05fb683ba3aa3 (patch) | |
| tree | fe9841b708e526eaecced55a868c72a2f8af16c1 /lib/CMakeLists.txt | |
| parent | 06047d91036130bce6fde44ee481582c1a979706 (diff) | |
| download | curl-b85154f13fa5bf25d7da2fa4eaa05fb683ba3aa3.tar.gz | |
Added tests (exes) targets, refactor a few things.
PS: Once again, sorry if the added files have executable perms on Linux.
Diffstat (limited to 'lib/CMakeLists.txt')
| -rw-r--r-- | lib/CMakeLists.txt | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index b938000c0..7e55c7d79 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -110,14 +110,6 @@ IF(CURL_MALLOC_DEBUG) ) ENDIF(CURL_MALLOC_DEBUG) -IF(CMAKE_USE_OPENSSL AND OPENSSL_FOUND) - INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) -ENDIF() - -IF(CURL_ZLIB AND ZLIB_FOUND) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) -ENDIF() - IF(HAVE_FEATURES_H) SET_SOURCE_FILES_PROPERTIES( cookie.c @@ -220,15 +212,7 @@ ADD_DEFINITIONS( -DBUILDING_LIBCURL ) -IF(CURL_ZLIB AND ZLIB_FOUND) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ZLIB_LIBRARIES}) - #ADD_DEFINITIONS( -DHAVE_ZLIB_H -DHAVE_ZLIB -DHAVE_LIBZ ) -ENDIF() - -# IF(CURL_SSL AND CURL_CONFIG_HAS_BEEN_RUN_BEFORE) - # TARGET_LINK_LIBRARIES(${LIB_NAME} ${OPENSSL_LIBRARIES}) - # ADD_DEFINITIONS( -DUSE_SSLEAY ) -# ENDIF() +SETUP_CURL_DEPENDENCIES(${LIB_NAME}) # Remove the "lib" prefix since the library is already named "libcurl". SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "") |