Skip to content

Commit 084222e

Browse files
committed
Android: install depend libraries
1 parent f71100c commit 084222e

3 files changed

Lines changed: 20 additions & 8 deletions

File tree

.github/workflows/vcpkg.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
name: vcpkg
44

5-
on:
6-
push:
7-
pull_request:
5+
#on:
6+
# push:
7+
# pull_request:
88

99
jobs:
1010
vcpkg:

Plugins/FtpServer/CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ if(NOT QFtpServerLib_FOUND)
2020
FetchContent_MakeAvailable(QFtpServerLib)
2121
endif()
2222

23-
option(INSTALL_QFtpServer "Install QFtpServer libraries" OFF)
24-
if(INSTALL_QFtpServer)
25-
INSTALL_TARGETS(TARGETS QFtpServerLib)
26-
endif()
27-
2823
SET(FtpServer_PRIVATE_LIBS Plugin QFtpServerLib)
2924
SET(SOURCE_FILES
3025
PluginFtpServer.cpp
@@ -71,3 +66,13 @@ ADD_PLUGIN_TARGET(NAME PluginService${PROJECT_NAME}
7166
INSTALL_RPATH ${INSTALL_RPATH}
7267
VERSION ${RabbitRemoteControl_VERSION}
7368
)
69+
70+
option(INSTALL_QFtpServer "Install QFtpServer libraries" OFF)
71+
if(INSTALL_QFtpServer)
72+
if(ANDROID)
73+
set_target_properties(PluginService${PROJECT_NAME} PROPERTIES
74+
QT_ANDROID_EXTRA_LIBS $<TARGET_SONAME_FILE:PluginService${PROJECT_NAME}>)
75+
else()
76+
INSTALL_TARGETS(TARGETS QFtpServerLib)
77+
endif()
78+
endif()

Src/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,3 +349,10 @@ ADD_TARGET(NAME ${PROJECT_NAME}
349349
INSTALL_EXPORT_NAME ${PROJECT_NAME}Targets
350350
INSTALL_NAMESPACE RabbitRemoteControl
351351
)
352+
353+
if(ANDROID)
354+
if(INSTALL_QTKEYCHAIN)
355+
set_target_properties(${PROJECT_NAME} PROPERTIES
356+
QT_ANDROID_EXTRA_LIBS $<TARGET_SONAME_FILE:Qt${QT_VERSION_MAJOR}Keychain::Qt${QT_VERSION_MAJOR}Keychain>)
357+
endif()
358+
endif()

0 commit comments

Comments
 (0)