Unverified Commit 7867aaa9 authored by John Butterfield's avatar John Butterfield Committed by Daniel Stenberg
Browse files

cmake: link curl to the OpenSSL targets instead of lib absolute paths 

Reviewed-by: Jakub Zakrzewski
Reviewed-by: Sergei Nikulov
Closes #2753
parent 537763f7

CMake/curl-config.cmake→CMake/curl-config.cmake.in

+5 −0
Original line number Diff line number Diff line
@@ -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")

CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -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)
@@ -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(

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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