File tree Expand file tree Collapse file tree 7 files changed +16
-8
lines changed
examples/autopilot_server Expand file tree Collapse file tree 7 files changed +16
-8
lines changed Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ find_package(Threads REQUIRED)
15
15
target_link_libraries (autopilot_server
16
16
MAVSDK::mavsdk
17
17
Threads::Threads
18
+ ${CMAKE_DL_LIBS}
18
19
)
19
20
20
21
if (NOT MSVC )
Original file line number Diff line number Diff line change @@ -75,6 +75,7 @@ target_link_libraries(integration_tests_runner
75
75
GTest::gtest
76
76
GTest::gtest_main
77
77
GTest::gmock
78
+ ${CMAKE_DL_LIBS}
78
79
)
79
80
80
81
add_test (integration_tests
Original file line number Diff line number Diff line change @@ -14,6 +14,8 @@ find_package(tinyxml2 REQUIRED)
14
14
find_package (libevents REQUIRED )
15
15
16
16
target_link_libraries (mavsdk
17
+ PUBLIC
18
+ ${CMAKE_DL_LIBS}
17
19
PRIVATE
18
20
JsonCpp::JsonCpp
19
21
tinyxml2::tinyxml2
Original file line number Diff line number Diff line change @@ -35,6 +35,7 @@ target_link_libraries(system_tests_runner
35
35
GTest::gtest
36
36
GTest::gtest_main
37
37
GTest::gmock
38
+ ${CMAKE_DL_LIBS}
38
39
)
39
40
40
41
set_target_properties (system_tests_runner
Original file line number Diff line number Diff line change @@ -19,6 +19,7 @@ target_link_libraries(unit_tests_runner
19
19
GTest::gtest
20
20
GTest::gtest_main
21
21
GTest::gmock
22
+ ${CMAKE_DL_LIBS}
22
23
)
23
24
24
25
target_include_directories (unit_tests_runner
Original file line number Diff line number Diff line change @@ -14,14 +14,20 @@ if(SUPERBUILD)
14
14
build_target (liblzma )
15
15
16
16
if (NOT BUILD_WITHOUT_CURL )
17
+ build_target (openssl )
18
+
17
19
if (NOT IOS )
18
20
build_target (zlib-ng )
19
21
endif ()
22
+
20
23
build_target (curl )
21
24
endif ()
22
25
23
26
if (BUILD_MAVSDK_SERVER )
24
- build_target (openssl )
27
+ if (BUILD_WITHOUT_CURL )
28
+ build_target (openssl )
29
+ endif ()
30
+
25
31
build_target (cares )
26
32
build_target (absl )
27
33
build_target (protobuf )
Original file line number Diff line number Diff line change @@ -9,8 +9,9 @@ list(APPEND CMAKE_ARGS
9
9
"-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE} "
10
10
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
11
11
"-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} "
12
- "-DCURL_USE_OPENSSL=OFF "
12
+ "-DCURL_USE_OPENSSL=ON "
13
13
"-DCURL_USE_LIBSSH2=OFF"
14
+ "-DBUILD_CURL_EXE=OFF"
14
15
"-DBUILD_SHARED_LIBS=OFF"
15
16
"-DCURL_CA_PATH_SET=OFF"
16
17
"-DCURL_ZLIB=OFF"
@@ -19,13 +20,8 @@ list(APPEND CMAKE_ARGS
19
20
"-DBUILD_TESTING=OFF"
20
21
)
21
22
22
- if (ANDROID )
23
+ if (IOS )
23
24
list (APPEND CMAKE_ARGS
24
- "-DBUILD_CURL_EXE=OFF"
25
- )
26
- elseif (IOS )
27
- list (APPEND CMAKE_ARGS
28
- "-DBUILD_CURL_EXE=OFF"
29
25
"-DPLATFORM=${PLATFORM} "
30
26
"-DDEPLOYMENT_TARGET=${DEPLOYMENT_TARGET} "
31
27
"-DENABLE_STRICT_TRY_COMPILE=${ENABLE_STRICT_TRY_COMPILE} "
You can’t perform that action at this time.
0 commit comments