70 lines
2.9 KiB
Diff
70 lines
2.9 KiB
Diff
|
diff -crB --recursive cpr-1.10.5/cmake/zlib_external.cmake cpr-1.10.5_vanilla/cmake/zlib_external.cmake
|
||
|
|
*** cpr-1.10.5/cmake/zlib_external.cmake 2024-02-05 14:59:45.999602174 -0800
|
||
|
|
--- cpr-1.10.5_vanilla/cmake/zlib_external.cmake 2023-10-14 05:45:47.000000000 -0700
|
||
|
|
***************
|
||
|
|
*** 8,14 ****
|
||
|
|
set(ZLIB_COMPAT ON CACHE INTERNAL "" FORCE)
|
||
|
|
set(ZLIB_ENABLE_TESTS OFF CACHE INTERNAL "" FORCE)
|
||
|
|
|
||
|
|
! #FetchContent Zlib
|
||
|
|
|
||
|
|
# Fix Windows zlib dll names from "zlibd1.dll" to "zlib.dll":
|
||
|
|
if(WIN32)
|
||
|
|
--- 8,18 ----
|
||
|
|
set(ZLIB_COMPAT ON CACHE INTERNAL "" FORCE)
|
||
|
|
set(ZLIB_ENABLE_TESTS OFF CACHE INTERNAL "" FORCE)
|
||
|
|
|
||
|
|
! FetchContent_Declare(zlib
|
||
|
|
! GIT_REPOSITORY https://github.com/zlib-ng/zlib-ng
|
||
|
|
! GIT_TAG 2.0.6
|
||
|
|
! USES_TERMINAL_DOWNLOAD TRUE)
|
||
|
|
! FetchContent_MakeAvailable(zlib)
|
||
|
|
|
||
|
|
# Fix Windows zlib dll names from "zlibd1.dll" to "zlib.dll":
|
||
|
|
if(WIN32)
|
||
|
|
diff -crB --recursive cpr-1.10.5/CMakeLists.txt cpr-1.10.5_vanilla/CMakeLists.txt
|
||
|
|
*** cpr-1.10.5/CMakeLists.txt 2024-02-05 14:27:13.419578081 -0800
|
||
|
|
--- cpr-1.10.5_vanilla/CMakeLists.txt 2023-10-14 05:45:47.000000000 -0700
|
||
|
|
***************
|
||
|
|
*** 277,284 ****
|
||
|
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
|
||
|
|
cmake_policy(SET CMP0135 NEW)
|
||
|
|
endif()
|
||
|
|
!
|
||
|
|
! #FetchContent
|
||
|
|
|
||
|
|
restore_variable(DESTINATION CMAKE_CXX_CLANG_TIDY BACKUP CMAKE_CXX_CLANG_TIDY_BKP)
|
||
|
|
endif()
|
||
|
|
--- 277,287 ----
|
||
|
|
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
|
||
|
|
cmake_policy(SET CMP0135 NEW)
|
||
|
|
endif()
|
||
|
|
! FetchContent_Declare(curl
|
||
|
|
! URL https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.tar.xz
|
||
|
|
! URL_HASH SHA256=16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d # the file hash for curl-8.4.0.tar.xz
|
||
|
|
! USES_TERMINAL_DOWNLOAD TRUE) # <---- This is needed only for Ninja to show download progress
|
||
|
|
! FetchContent_MakeAvailable(curl)
|
||
|
|
|
||
|
|
restore_variable(DESTINATION CMAKE_CXX_CLANG_TIDY BACKUP CMAKE_CXX_CLANG_TIDY_BKP)
|
||
|
|
endif()
|
||
|
|
diff -crB --recursive cpr-1.10.5/cpr/CMakeLists.txt cpr-1.10.5_vanilla/cpr/CMakeLists.txt
|
||
|
|
*** cpr-1.10.5/cpr/CMakeLists.txt 2024-02-05 15:52:49.719516303 -0800
|
||
|
|
--- cpr-1.10.5_vanilla/cpr/CMakeLists.txt 2023-10-14 05:45:47.000000000 -0700
|
||
|
|
***************
|
||
|
|
*** 32,38 ****
|
||
|
|
|
||
|
|
add_library(cpr::cpr ALIAS cpr)
|
||
|
|
|
||
|
|
! target_link_libraries(cpr PUBLIC -lcurl) # todo should be private, but first dependencies in ssl_options need to be removed
|
||
|
|
|
||
|
|
# Fix missing OpenSSL includes for Windows since in 'ssl_ctx.cpp' we include OpenSSL directly
|
||
|
|
if(SSL_BACKEND_USED STREQUAL "OpenSSL")
|
||
|
|
--- 32,38 ----
|
||
|
|
|
||
|
|
add_library(cpr::cpr ALIAS cpr)
|
||
|
|
|
||
|
|
! target_link_libraries(cpr PUBLIC CURL::libcurl) # todo should be private, but first dependencies in ssl_options need to be removed
|
||
|
|
|
||
|
|
# Fix missing OpenSSL includes for Windows since in 'ssl_ctx.cpp' we include OpenSSL directly
|
||
|
|
if(SSL_BACKEND_USED STREQUAL "OpenSSL")
|