From e317daf081a1048904fdf0b548946fa3ba6593a7 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Mon, 29 Apr 2019 12:22:05 +0200
Subject: sync with upstream

---
 cmake/modules/FindCurl.cmake | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'cmake/modules/FindCurl.cmake')

diff --git a/cmake/modules/FindCurl.cmake b/cmake/modules/FindCurl.cmake
index 6ccf44a..6411a92 100644
--- a/cmake/modules/FindCurl.cmake
+++ b/cmake/modules/FindCurl.cmake
@@ -25,6 +25,19 @@ find_library(CURL_LIBRARY NAMES curl libcurl libcurl_imp
 
 set(CURL_VERSION ${PC_CURL_VERSION})
 
+set(CURL_LIB_TYPE SHARED)
+set(CURL_LDFLAGS ${PC_CURL_LDFLAGS})
+
+# check if curl is statically linked
+if(${CURL_LIBRARY} MATCHES ".+\.a$" AND PC_CURL_STATIC_LDFLAGS)
+  set(CURL_LIB_TYPE STATIC)
+  set(CURL_LDFLAGS ${PC_CURL_STATIC_LDFLAGS})
+
+  pkg_check_modules(PC_NGHTTP2 libnghttp2 QUIET)
+  find_library(NGHTTP2_LIBRARY NAMES libnghttp2 nghttp2
+                               PATHS ${PC_NGHTTP2_LIBDIR})
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Curl
                                   REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR
@@ -32,10 +45,10 @@ find_package_handle_standard_args(Curl
 
 if(CURL_FOUND)
   set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
-  set(CURL_LIBRARIES ${CURL_LIBRARY})
+  set(CURL_LIBRARIES ${CURL_LIBRARY} ${NGHTTP2_LIBRARY})
 
   if(NOT TARGET Curl::Curl)
-    add_library(Curl::Curl UNKNOWN IMPORTED)
+    add_library(Curl::Curl ${CURL_LIB_TYPE} IMPORTED)
     set_target_properties(Curl::Curl PROPERTIES
                                      IMPORTED_LOCATION "${CURL_LIBRARY}"
                                      INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIR}")
@@ -46,4 +59,4 @@ if(CURL_FOUND)
   endif()
 endif()
 
-mark_as_advanced(CURL_INCLUDE_DIR CURL_LIBRARY)
+mark_as_advanced(CURL_INCLUDE_DIR CURL_LIBRARY CURL_LDFLAGS)
-- 
cgit v1.2.3