Skip to content

Commit

Permalink
cmake: link curl to the OpenSSL targets instead of lib absolute paths
Browse files Browse the repository at this point in the history
Reviewed-by: Jakub Zakrzewski
Reviewed-by: Sergei Nikulov
Closes curl#2753
  • Loading branch information
johnb003 authored and falconindy committed Sep 10, 2018
1 parent b8603f2 commit fc8d7d4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
5 changes: 5 additions & 0 deletions CMake/curl-config.cmake → CMake/curl-config.cmake.in
Expand Up @@ -9,6 +9,11 @@ if(NOT CURL_FIND_COMPONENTS)
endif()
endif()

include(CMakeFindDependencyMacro)
if(CURL_FIND_REQUIRED_libcurl)
find_dependency(OpenSSL "@OPENSSL_VERSION_MAJOR@")
endif()

set(_curl_missing_components)
foreach(_comp ${CURL_FIND_COMPONENTS})
if(EXISTS "${_DIR}/${_comp}-target.cmake")
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Expand Up @@ -352,8 +352,8 @@ if(CMAKE_USE_OPENSSL)
set(USE_OPENSSL ON)
set(HAVE_LIBCRYPTO ON)
set(HAVE_LIBSSL ON)
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
include_directories(${OPENSSL_INCLUDE_DIR})
list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto)

set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H)
check_include_file("openssl/err.h" HAVE_OPENSSL_ERR_H)
Expand Down Expand Up @@ -1308,9 +1308,9 @@ write_basic_package_version_file(
COMPATIBILITY SameMajorVersion
)

configure_file(CMake/curl-config.cmake
configure_file(CMake/curl-config.cmake.in
"${PROJECT_BINARY_DIR}/curl-config.cmake"
COPYONLY
@ONLY
)

install(
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -31,7 +31,7 @@ CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in \
CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake \
CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.cmake \
CMake/FindMbedTLS.cmake CMake/cmake_uninstall.cmake.in \
CMake/curl-config.cmake
CMake/curl-config.cmake.in

VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl
VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist
Expand Down

0 comments on commit fc8d7d4

Please sign in to comment.