-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Theoretically add cpr 1.5.2 * Merge in attempts from #3207 * Doesn't exist there
- Loading branch information
1 parent
839c917
commit e725f03
Showing
4 changed files
with
37 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index c065227..3ed93b8 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -55,7 +55,7 @@ include(cmake/code_coverage.cmake) | ||
|
||
# Curl configuration | ||
if(USE_SYSTEM_CURL) | ||
- find_package(CURL COMPONENTS PROTOCOLS HTTP HTTPS FEATURES SSL) | ||
+ find_package(CURL) | ||
if (CURL_FOUND) | ||
set(SSL_ENABLED ON CACHE INTERNAL "" FORCE) | ||
else() | ||
diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt | ||
index 563b785..a7ccbdf 100644 | ||
--- a/cpr/CMakeLists.txt | ||
+++ b/cpr/CMakeLists.txt | ||
@@ -20,7 +20,8 @@ add_library(cpr | ||
|
||
add_library(cpr::cpr ALIAS cpr) | ||
|
||
-target_link_libraries(cpr PUBLIC CURL::libcurl) # todo should be private, but first dependencys in ssl_options need to be removed | ||
+target_link_libraries(cpr PUBLIC ${CURL_LIBRARIES}) # todo should be private, but first dependencys in ssl_options need to be removed | ||
+target_include_directories(cpr PUBLIC ${CURL_INCLUDE_DIRS}) | ||
|
||
# Set version for shared libraries. | ||
set_target_properties(cpr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,5 @@ versions: | |
folder: all | ||
"1.5.0": | ||
folder: all | ||
"1.5.2": | ||
folder: all |