Skip to content

Commit dc43891

Browse files
committed
Fix CPR variable name
After trying to use CPR 1.10.0 first, which uses a new variable name, we had to move back to 1.8.3, which works well with the system libcurl on Ubuntu bionic.
1 parent cb6ce63 commit dc43891

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ if(NOT USE_SYSTEM_CPR)
3030
# see
3131
find_package(CURL)
3232
if(CURL_FOUND)
33-
message(STATUS "Found libcurl CURL_VERSION_STRING")
33+
message(STATUS "Found libcurl ${CURL_VERSION_STRING}")
3434

35-
if(NOT DEFINED CPR_USE_SYSTEM_CURL)
35+
if(NOT DEFINED CPR_FORCE_USE_SYSTEM_CURL)
3636
if (CURL_VERSION_STRING VERSION_LESS_EQUAL 7.80.0)
37-
message(STATUS "libcurl is old enough to work with CPR, so we use the system one (use -DCPR_USE_SYSTEM_CURL=OFF to change this behavior)")
38-
set(CPR_USE_SYSTEM_CURL ON)
37+
message(STATUS "libcurl is old enough to work with CPR, so we use the system one (use -DCPR_FORCE_USE_SYSTEM_CURL=OFF to change this behavior)")
38+
set(CPR_FORCE_USE_SYSTEM_CURL ON)
3939
else()
40-
message(WARNING "libcurl is too new to work with CPR, so we let CPR build its own (use -DCPR_USE_SYSTEM_CURL=ON to change this behavior)")
41-
set(CPR_USE_SYSTEM_CURL ON)
40+
message(WARNING "libcurl is too new to work with CPR, so we let CPR build its own (use -DCPR_FORCE_USE_SYSTEM_CURL=ON to change this behavior)")
41+
set(CPR_FORCE_USE_SYSTEM_CURL ON)
4242
endif()
4343
else()
4444
message(WARNING "CPR_USE_SYSTEM_CURL is set to ${CPR_USE_SYSTEM_CURL} by the user")

0 commit comments

Comments
 (0)