Reapply our curl cmake patches and rename CMAKE_USE_OPENSSL

jameskr97 · May 30, 2022 · 32c3826 · 32c3826
1 parent f1dd6fe
commit 32c3826
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -16,7 +16,7 @@ set(BUILD_SHARED_LIBS OFF) # Tell CMake to prefer static libs
 set(CMAKE_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) # Disable curl libssh2
 set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE)    # Tell curl not to build standalone binary
 set(BUILD_TESTING OFF CACHE BOOL "" FORCE)     # Disable curl testing
-set(CMAKE_USE_OPENSSL ON CACHE BOOL "" FORCE)  # Require OpenSSL
+set(CURL_USE_OPENSSL ON CACHE BOOL "" FORCE)  # Require OpenSSL
 set(HTTP_ONLY ON CACHE BOOL "" FORCE)          # Disable all protocols except HTTP/S
 add_subdirectory(curl)
 

diff --git a/extern/curl/CMakeLists.txt b/extern/curl/CMakeLists.txt
@@ -960,7 +960,7 @@ check_include_file_concat("arpa/inet.h"      HAVE_ARPA_INET_H)
 check_include_file_concat("arpa/tftp.h"      HAVE_ARPA_TFTP_H)
 check_include_file_concat("assert.h"         HAVE_ASSERT_H)
 check_include_file_concat("errno.h"          HAVE_ERRNO_H)
-check_include_file_concat("fcntl.h"          HAVE_FCNTL_H)
+#check_include_file_concat("fcntl.h"          HAVE_FCNTL_H)
 check_include_file_concat("idn2.h"           HAVE_IDN2_H)
 check_include_file_concat("ifaddrs.h"        HAVE_IFADDRS_H)
 check_include_file_concat("io.h"             HAVE_IO_H)
@@ -1303,11 +1303,11 @@ if(MSVC)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
 
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
-  if(CMAKE_C_FLAGS MATCHES "/W[0-4]")
-    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-  else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
-  endif()
+#  if(CMAKE_C_FLAGS MATCHES "/W[0-4]")
+#    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+#  else()
+#    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
+#  endif()
 
   # Use multithreaded compilation on VS 2008+
   if(MSVC_VERSION GREATER_EQUAL 1500)