mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-12 13:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cmake: Got rid of setup_curl_dependencies

Browse Source 
There is no need for such function. Include_directories propagate by
themselves and having a function with one simple link statement makes
little sense.
This commit is contained in:
Jakub Zakrzewski 2014-08-22 17:02:59 +02:00 committed by Daniel Stenberg
parent 2257deb502
commit a3154295c5
5 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -378,6 +378,7 @@ if(CURL_ZLIB)
set(HAVE_ZLIB ON)
set(HAVE_LIBZ ON)
list(APPEND CURL_LIBS ${ZLIB_LIBRARIES})
include_directories(${ZLIB_INCLUDE_DIR})
endif()
endif()
@ -394,6 +395,7 @@ if(CMAKE_USE_LIBSSH2)
list(APPEND CURL_LIBS ${LIBSSH2_LIBRARY})
set(CMAKE_REQUIRED_LIBRARIES ${LIBSSH2_LIBRARY})
set(CMAKE_REQUIRED_INCLUDES "${LIBSSH2_INCLUDE_DIR}")
include_directories("${LIBSSH2_INCLUDE_DIR}")
set(HAVE_LIBSSH2 ON)
set(USE_LIBSSH2 ON)
@ -870,24 +872,6 @@ if(MSVC)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
endif(MSVC)
# Sets up the dependencies (zlib, OpenSSL, etc.) of a cURL subproject according to options.
# TODO This is far to be complete!
function(SETUP_CURL_DEPENDENCIES TARGET_NAME)
if(CURL_ZLIB AND ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIR})
endif()
if(CMAKE_USE_OPENSSL AND OPENSSL_FOUND)
include_directories(${OPENSSL_INCLUDE_DIR})
endif()
if(CMAKE_USE_LIBSSH2 AND LIBSSH2_FOUND)
include_directories(${LIBSSH2_INCLUDE_DIR})
endif()
target_link_libraries(${TARGET_NAME} ${CURL_LIBS})
endfunction()
# Ugly (but functional) way to include "Makefile.inc" by transforming it (= regenerate it).
function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)
file(READ ${INPUT_FILE} MAKEFILE_INC_TEXT)

2
lib/CMakeLists.txt
View File

@ -106,8 +106,6 @@ endif()
set_target_properties(${LIB_NAME} PROPERTIES COMPILE_DEFINITIONS BUILDING_LIBCURL)
setup_curl_dependencies(${LIB_NAME})
# Remove the "lib" prefix since the library is already named "libcurl".
set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
set_target_properties(${LIB_NAME} PROPERTIES IMPORT_PREFIX "")

7
src/CMakeLists.txt
View File

@ -30,11 +30,8 @@ include_directories(
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
)
# Setup dependencies
setup_curl_dependencies(${EXE_NAME})
target_link_libraries( ${EXE_NAME} libcurl )
#Build cURL executable
target_link_libraries( ${EXE_NAME} libcurl ${CURL_LIBS})
################################################################################

4
tests/libtest/CMakeLists.txt
View File

@ -12,8 +12,8 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test
if(CURL_USE_ARES)
include_directories(${CARES_INCLUDE_DIR})
endif()
setup_curl_dependencies(${TEST_NAME})
target_link_libraries( ${TEST_NAME} libcurl )
target_link_libraries( ${TEST_NAME} libcurl ${CURL_LIBS})
set_target_properties(${TEST_NAME}
PROPERTIES COMPILE_DEFINITIONS ${UPPER_TEST_NAME})

4
tests/server/CMakeLists.txt
View File

@ -12,8 +12,8 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test
if(CURL_USE_ARES)
include_directories(${CARES_INCLUDE_DIR})
endif()
# resolve test needs this
setup_curl_dependencies(${TEST_NAME})
target_link_libraries(${TEST_NAME} ${CURL_LIBS})
# Test servers simply are standalone programs that do not use libcurl
# library. For convinience and to ease portability of these servers,