libcurl: update to 8.4.0

1 files changed, 21 insertions, 30 deletions

diff --git a/libs/libcurl/src/CMakeLists.txt b/libs/libcurl/src/CMakeLists.txt
index 0f6bce9759..283488e935 100644
--- a/libs/libcurl/src/CMakeLists.txt
+++ b/libs/libcurl/src/CMakeLists.txt
@@ -56,9 +56,9 @@ add_library(
 target_compile_definitions(curlu PUBLIC UNITTESTS CURL_STATICLIB)

 

 if(ENABLE_CURLDEBUG)

-  # We must compile memdebug.c separately to avoid memdebug.h redefinitions

-  # being applied to memdebug.c itself.

-  set_source_files_properties(memdebug.c PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)

+  # We must compile these sources separately to avoid memdebug.h redefinitions

+  # applying to them.

+  set_source_files_properties(memdebug.c curl_multibyte.c PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)

 endif()

 target_link_libraries(curlu PRIVATE ${CURL_LIBS})

 

@@ -85,19 +85,6 @@ else()
   unset(CMAKESONAME)

 endif()

 

-if(NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)

-  # on not-Windows and not-crosscompiling, check for writable argv[]

-    include(CheckCSourceRuns)

-    check_c_source_runs("

-int main(int argc, char **argv)

-{

-  (void)argc;

-  argv[0][0] = ' ';

-  return (argv[0][0] == ' ')?0:1;

-}"

-      HAVE_WRITABLE_ARGV)

-endif()

-

 ## Library definition

 

 # Add "_imp" as a suffix before the extension to avoid conflicting with

@@ -122,18 +109,23 @@ if(NOT DEFINED SHARE_LIB_OBJECT)
   endif()

 endif()

 

+if(WIN32)

+  # Define CURL_STATICLIB always, to disable __declspec(dllexport) for exported

+  # libcurl symbols. We handle exports via libcurl.def instead. Except with

+  # symbol hiding disabled or debug mode enabled, when we export _all_ symbols

+  # from libcurl DLL, without using libcurl.def.

+  add_definitions("-DCURL_STATICLIB")

+endif()

+

 if(SHARE_LIB_OBJECT)

   set(LIB_OBJECT "libcurl_object")

   add_library(${LIB_OBJECT} OBJECT ${HHEADERS} ${CSOURCES})

   target_link_libraries(${LIB_OBJECT} PRIVATE ${CURL_LIBS})

   set_target_properties(${LIB_OBJECT} PROPERTIES

-    COMPILE_DEFINITIONS "BUILDING_LIBCURL"

-    INTERFACE_COMPILE_DEFINITIONS "CURL_STATICLIB"

     POSITION_INDEPENDENT_CODE ON)

   if(HIDES_CURL_PRIVATE_SYMBOLS)

-    set_target_properties(${LIB_OBJECT} PROPERTIES

-      COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS"

-      COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")

+    set_property(TARGET ${LIB_OBJECT} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")

+    set_property(TARGET ${LIB_OBJECT} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS")

   endif()

   if(CURL_HAS_LTO)

     set_target_properties(${LIB_OBJECT} PROPERTIES

@@ -160,12 +152,10 @@ if(BUILD_STATIC_LIBS)
   set_target_properties(${LIB_STATIC} PROPERTIES

     PREFIX "" OUTPUT_NAME "${LIBCURL_OUTPUT_NAME}"

     SUFFIX "${STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"

-    COMPILE_DEFINITIONS "BUILDING_LIBCURL"

     INTERFACE_COMPILE_DEFINITIONS "CURL_STATICLIB")

   if(HIDES_CURL_PRIVATE_SYMBOLS)

-    set_target_properties(${LIB_STATIC} PROPERTIES

-      COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS"

-      COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")

+    set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")

+    set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS")

   endif()

   if(CURL_HAS_LTO)

     set_target_properties(${LIB_STATIC} PROPERTIES

@@ -187,19 +177,20 @@ if(BUILD_SHARED_LIBS)
   add_library(${LIB_SHARED} SHARED ${LIB_SOURCE})

   add_library(${PROJECT_NAME}::${LIB_SHARED} ALIAS ${LIB_SHARED})

   if(WIN32)

-    set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES libcurl.rc ${CURL_SOURCE_DIR}/libcurl.def)

+    set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES libcurl.rc)

+    if(HIDES_CURL_PRIVATE_SYMBOLS)

+      set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES "${CURL_SOURCE_DIR}/libcurl.def")

+    endif()

   endif()

   target_link_libraries(${LIB_SHARED} PRIVATE ${CURL_LIBS})

   # Remove the "lib" prefix since the library is already named "libcurl".

   set_target_properties(${LIB_SHARED} PROPERTIES

     PREFIX "" OUTPUT_NAME "${LIBCURL_OUTPUT_NAME}"

     IMPORT_PREFIX "" IMPORT_SUFFIX "${IMPORT_LIB_SUFFIX}${CMAKE_IMPORT_LIBRARY_SUFFIX}"

-    COMPILE_DEFINITIONS "BUILDING_LIBCURL"

     POSITION_INDEPENDENT_CODE ON)

   if(HIDES_CURL_PRIVATE_SYMBOLS)

-    set_target_properties(${LIB_SHARED} PROPERTIES

-      COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS"

-      COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")

+    set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_FLAGS "${CURL_CFLAG_SYMBOLS_HIDE}")

+    set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_HIDDEN_SYMBOLS")

   endif()

   if(CURL_HAS_LTO)

     set_target_properties(${LIB_SHARED} PROPERTIES