From 24a321b70ff82725a106d74594a15acb05eeb08e Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 26 Mar 2020 12:19:46 +0100
Subject: [PATCH] TMSS-156: adapted FindCurlCpp.cmake to search for curl.h and
libcurl as well
---
CMake/FindCurlCpp.cmake | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMake/FindCurlCpp.cmake b/CMake/FindCurlCpp.cmake
index 5f19279f892..4aeacf2e43c 100644
--- a/CMake/FindCurlCpp.cmake
+++ b/CMake/FindCurlCpp.cmake
@@ -33,15 +33,19 @@ if(NOT CURLCPP_FOUND)
find_path(CURLCPP_INCLUDE_DIR curlpp/cURLpp.hpp
HINTS ${CURLCPP_ROOT_DIR} PATH_SUFFIXES include)
+ find_path(CURL_INCLUDE_DIR curl/curl.h
+ HINTS ${CURL_ROOT_DIR} PATH_SUFFIXES include) # curlpp depends on curl headers
+
find_library(CURLCPP_LIBRARY curlpp
HINTS ${CURLCPP_ROOT_DIR} PATH_SUFFIXES lib)
- mark_as_advanced(CURLCPP_INCLUDE_DIR CURLCPP_LIBRARY)
+ find_library(CURL_LIBRARY curl) # curlpp depends on libcurl
+ mark_as_advanced(CURLCPP_INCLUDE_DIR CURLCPP_LIBRARY CURL_LIBRARY)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(curlcpp DEFAULT_MSG
CURLCPP_LIBRARY CURLCPP_INCLUDE_DIR)
- set(CURLCPP_INCLUDE_DIRS ${CURLCPP_INCLUDE_DIR})
- set(CURLCPP_LIBRARIES ${CURLCPP_LIBRARY})
+ set(CURLCPP_INCLUDE_DIRS ${CURLCPP_INCLUDE_DIR} ${CURL_INCLUDE_DIR})
+ set(CURLCPP_LIBRARIES ${CURLCPP_LIBRARY} ${CURL_LIBRARY})
endif(NOT CURLCPP_FOUND)
--
GitLab