Skip to content

Commit 63d9403

Browse files
author
Tor Didriksen
committed
Bug#37389565 CURL UPDATE TO AT LEAST 8.11.1 [new patches]
Disable the BUILD_EXAMPLES option (which is shared with many other 3rd party libs) Disable CURL_USE_LIBPSL Add CURL_DISABLE_DEPRECATION for clang on win. Change-Id: I9b4994d45b17b278dd91833cbbb8e3d6f264dda3 (cherry picked from commit f660631664d35fbfd15556647770403fb7299f16) (cherry picked from commit a917cc2b0db451af31de01323df733abd98f5a5d)
1 parent ab7afda commit 63d9403

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

cmake/curl.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,10 @@ FUNCTION(MYSQL_CHECK_CURL)
260260
SET_TARGET_PROPERTIES(curl_interface PROPERTIES INTERFACE_COMPILE_OPTIONS
261261
"-Wno-error=deprecated-declarations")
262262
ENDIF()
263+
IF(WIN32_CLANG)
264+
SET_TARGET_PROPERTIES(curl_interface PROPERTIES INTERFACE_COMPILE_DEFINITIONS
265+
CURL_DISABLE_DEPRECATION)
266+
ENDIF()
263267

264268
ENDFUNCTION(MYSQL_CHECK_CURL)
265269

extra/curl/curl-8.11.1/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ if(USE_LIBIDN2 AND NOT USE_APPLE_IDN AND NOT USE_WIN32_IDN)
11471147
endif()
11481148

11491149
# libpsl
1150-
option(CURL_USE_LIBPSL "Use libpsl" ON)
1150+
option(CURL_USE_LIBPSL "Use libpsl" OFF)
11511151
mark_as_advanced(CURL_USE_LIBPSL)
11521152
set(USE_LIBPSL OFF)
11531153

@@ -1902,7 +1902,7 @@ if(BUILD_CURL_EXE)
19021902
add_subdirectory(src)
19031903
endif()
19041904

1905-
option(BUILD_EXAMPLES "Build libcurl examples" ON)
1905+
option(BUILD_EXAMPLES "Build libcurl examples" OFF)
19061906
if(BUILD_EXAMPLES)
19071907
add_subdirectory(docs/examples)
19081908
endif()

0 commit comments

Comments
 (0)