third_party: don't bother with https

Getting the OpenSSL dependency to work with cURL is too hard for me.
mavlink · Nov 11, 2024 · 38258b4 · 38258b4
1 parent 50ee84c
commit 38258b4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/src/mavsdk/plugins/camera/camera_impl.cpp b/src/mavsdk/plugins/camera/camera_impl.cpp
@@ -1315,7 +1315,7 @@ void CameraImpl::check_camera_definition_with_lock(PotentialCamera& potential_ca
             potential_camera.camera_definition_result = Camera::Result::ProtocolUnsupported;
             notify_camera_list_with_lock();
 
-        } else if (starts_with(url, "http://") || starts_with(url, "https://")) {
+        } else if (starts_with(url, "http://"))) {
 #if BUILD_WITHOUT_CURL == 1
             potential_camera.camera_definition_result = Camera::Result::ProtocolUnsupported;
             notify_camera_list();

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -13,6 +13,13 @@ if(SUPERBUILD)
     build_target(tinyxml2)
     build_target(liblzma)
 
+    if(NOT BUILD_WITHOUT_CURL)
+        if(NOT IOS)
+            build_target(zlib-ng)
+        endif()
+        build_target(curl)
+    endif()
+
     if(BUILD_MAVSDK_SERVER)
         build_target(openssl)
         build_target(cares)
@@ -22,13 +29,6 @@ if(SUPERBUILD)
         build_target(grpc)
     endif()
 
-    if(NOT BUILD_WITHOUT_CURL)
-        if(NOT IOS)
-            build_target(zlib-ng)
-        endif()
-        build_target(curl)
-    endif()
-
     if(BUILD_TESTING)
         build_target(gtest)
     endif()

diff --git a/third_party/curl/CMakeLists.txt b/third_party/curl/CMakeLists.txt
@@ -9,13 +9,12 @@ list(APPEND CMAKE_ARGS
     "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}"
     "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
     "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
-    "-DCURL_USE_OPENSSL=ON"
+    "-DCURL_USE_OPENSSL=OFF"
     "-DCURL_USE_LIBSSH2=OFF"
-    "-DUSE_LIBIDN2=OFF"
     "-DBUILD_SHARED_LIBS=OFF"
     "-DCURL_CA_PATH_SET=OFF"
     "-DCURL_ZLIB=OFF"
-    "-DHTTP_ONLY=OFF"
+    "-DHTTP_ONLY=ON"
     "-DHAVE_POSIX_STRERROR_R=1"
     "-DBUILD_TESTING=OFF"
     )

diff --git a/third_party/openssl/CMakeLists.txt b/third_party/openssl/CMakeLists.txt
@@ -101,7 +101,7 @@ else()
         openssl
         URL https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
         PREFIX openssl
-        CONFIGURE_COMMAND <SOURCE_DIR>/config ${OPENSSL_BUILD_TYPE} --prefix=${CMAKE_INSTALL_PREFIX} no-shared no-module
+        CONFIGURE_COMMAND <SOURCE_DIR>/config ${OPENSSL_BUILD_TYPE} --prefix=${CMAKE_INSTALL_PREFIX} no-shared
         BUILD_COMMAND make
         INSTALL_COMMAND make install_sw
         )