|
|
|
@ -1,15 +1,17 @@ |
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index c2610db..abee1c8 100644
|
|
|
|
|
index c2610db..8019638 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -57,15 +57,16 @@ endif()
|
|
|
|
|
@@ -56,19 +56,19 @@ endif()
|
|
|
|
|
# Dependencies
|
|
|
|
|
# ------------
|
|
|
|
|
|
|
|
|
|
find_package(OpenSSL REQUIRED)
|
|
|
|
|
-find_package(OpenSSL REQUIRED)
|
|
|
|
|
-find_package(unofficial-curlpp CONFIG REQUIRED)
|
|
|
|
|
-find_package(unofficial-inih CONFIG REQUIRED)
|
|
|
|
|
+find_package(CURL REQUIRED)
|
|
|
|
|
+include(FindPkgConfig)
|
|
|
|
|
+pkg_search_module(openssl3 REQUIRED IMPORTED_TARGET openssl3)
|
|
|
|
|
+find_package(CURL REQUIRED)
|
|
|
|
|
+pkg_search_module(curlpp REQUIRED IMPORTED_TARGET curlpp)
|
|
|
|
|
+pkg_search_module(inih REQUIRED IMPORTED_TARGET inih)
|
|
|
|
|
find_package(nlohmann_json CONFIG REQUIRED)
|
|
|
|
@ -19,11 +21,14 @@ index c2610db..abee1c8 100644 |
|
|
|
|
list(APPEND MINIO_CPP_LIBS
|
|
|
|
|
- unofficial::curlpp::curlpp
|
|
|
|
|
- unofficial::inih::inireader
|
|
|
|
|
+ PkgConfig::curlpp CURL::libcurl PkgConfig::inih
|
|
|
|
|
+ PkgConfig::curlpp CURL::libcurl PkgConfig::openssl3 PkgConfig::inih
|
|
|
|
|
nlohmann_json::nlohmann_json
|
|
|
|
|
pugixml
|
|
|
|
|
OpenSSL::SSL OpenSSL::Crypto
|
|
|
|
|
@@ -115,7 +116,7 @@ set(MINIO_CPP_HEADERS
|
|
|
|
|
- OpenSSL::SSL OpenSSL::Crypto
|
|
|
|
|
ZLIB::ZLIB
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
@@ -115,7 +115,7 @@ set(MINIO_CPP_HEADERS
|
|
|
|
|
include/miniocpp/utils.h
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
@ -32,7 +37,7 @@ index c2610db..abee1c8 100644 |
|
|
|
|
target_compile_options(miniocpp PRIVATE ${MINIO_CPP_CFLAGS})
|
|
|
|
|
target_compile_features(miniocpp PUBLIC cxx_std_${MINIO_CPP_STD})
|
|
|
|
|
target_include_directories(miniocpp PUBLIC
|
|
|
|
|
@@ -124,7 +125,6 @@ target_include_directories(miniocpp PUBLIC
|
|
|
|
|
@@ -124,7 +124,6 @@ target_include_directories(miniocpp PUBLIC
|
|
|
|
|
)
|
|
|
|
|
target_link_libraries(miniocpp PUBLIC ${MINIO_CPP_LIBS})
|
|
|
|
|
set_target_properties(miniocpp PROPERTIES VERSION "${MINIO_CPP_VERSION_STRING}")
|
|
|
|
|