diff --git a/src/integration_tests/CMakeLists.txt b/src/integration_tests/CMakeLists.txt index 169afb9835..e6bf6b7cb8 100644 --- a/src/integration_tests/CMakeLists.txt +++ b/src/integration_tests/CMakeLists.txt @@ -75,6 +75,7 @@ target_link_libraries(integration_tests_runner GTest::gtest GTest::gtest_main GTest::gmock + ${CMAKE_DL_LIBS} ) add_test(integration_tests diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 0e4f5414ce..1b4c925fd1 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -14,14 +14,20 @@ if(SUPERBUILD) build_target(liblzma) if(NOT BUILD_WITHOUT_CURL) + build_target(openssl) + if(NOT IOS) build_target(zlib-ng) endif() + build_target(curl) endif() if(BUILD_MAVSDK_SERVER) - build_target(openssl) + if (BUILD_WITHOUT_CURL) + build_target(openssl) + endif() + build_target(cares) build_target(absl) build_target(protobuf) diff --git a/third_party/curl/CMakeLists.txt b/third_party/curl/CMakeLists.txt index 06365c2110..b5c83a1494 100644 --- a/third_party/curl/CMakeLists.txt +++ b/third_party/curl/CMakeLists.txt @@ -9,8 +9,9 @@ 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=OFF" + "-DCURL_USE_OPENSSL=ON" "-DCURL_USE_LIBSSH2=OFF" + "-DBUILD_CURL_EXE=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DCURL_CA_PATH_SET=OFF" "-DCURL_ZLIB=OFF" @@ -19,13 +20,8 @@ list(APPEND CMAKE_ARGS "-DBUILD_TESTING=OFF" ) -if(ANDROID) +if(IOS) list(APPEND CMAKE_ARGS - "-DBUILD_CURL_EXE=OFF" - ) -elseif(IOS) - list(APPEND CMAKE_ARGS - "-DBUILD_CURL_EXE=OFF" "-DPLATFORM=${PLATFORM}" "-DDEPLOYMENT_TARGET=${DEPLOYMENT_TARGET}" "-DENABLE_STRICT_TRY_COMPILE=${ENABLE_STRICT_TRY_COMPILE}"