blob: 000359be0d94ca015b09146af2129330596e5cdf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From 03947c2a47bf7458ed093355e71a4f411a725330 Mon Sep 17 00:00:00 2001
From: Scott Ware <scott.r.ware@intel.com>
Date: Tue, 7 Apr 2020 20:59:53 +0100
Subject: [PATCH 2/2] Use pkg-config to find libs
Signed-off-by: Scott Ware <scott.r.ware@intel.com>
---
CMakeLists.txt | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5251ffe..52ab416 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,9 +116,13 @@ if(${use_openssl})
# If OpenSSL::SSL OR OpenSSL::Crypto are not set then you need to run
# the find package for openssl
if (NOT TARGET OpenSSL::SSL OR NOT TARGET OpenSSL::Crypto OR NOT ${OPENSSL_INCLUDE_DIR})
- find_package(OpenSSL REQUIRED)
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+ pkg_check_modules(OPENSSL libssl)
+ pkg_check_modules(CRYPTO libcrypto)
+ endif()
endif()
- include_directories(${OPENSSL_INCLUDE_DIR})
+ include_directories(${OPENSSL_INCLUDE_DIR} ${CRYPTO_INCLUDE_DIR})
endif()
if(${use_applessl})
@@ -511,26 +515,11 @@ if(${use_http})
set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 winhttp)
else()
if (NOT use_builtin_httpapi)
- if (CMAKE_CROSSCOMPILING)
- # As mentioned at https://cmake.org/Wiki/CMake_Cross_Compiling the
- # pkg-config tool can not be used by cmake while cross compiling.
- message(STATUS "Cross compiling not using pkg-config")
- else()
- # try pkg-config first
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
- pkg_check_modules(CURL libcurl)
- endif()
- endif()
-
- # if that didn't work, try CMake find_package
- if(NOT CURL_FOUND)
- find_package(CURL)
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+ pkg_check_modules(CURL libcurl)
endif()
- set(CURL_FIND_REQUIRED 1)
- find_package_handle_standard_args(CURL DEFAULT_MSG CURL_LIBRARIES)
-
include_directories(${CURL_INCLUDE_DIRS})
set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${CURL_LIBRARIES})
endif(NOT use_builtin_httpapi)
@@ -571,7 +560,7 @@ if(${use_bearssl})
endif()
if(${use_openssl})
- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES})
+ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARIES})
if (WIN32)
set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} crypt32 ws2_32 secur32)
endif()
--
2.7.4
|
