Browse Source

Fix plugin names for Qt6 Android

chirpmodem-v8.0.0
Jon Beniston 2 years ago
parent
commit
907fe25d3c
  1. 14
      plugins/feature/antennatools/CMakeLists.txt
  2. 5
      sdrbase/plugin/pluginmanager.cpp

14
plugins/feature/antennatools/CMakeLists.txt

@ -41,11 +41,17 @@ else() @@ -41,11 +41,17 @@ else()
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
endif()
add_library(${TARGET_NAME} SHARED
${antennatools_SOURCES}
)
if(NOT Qt6_FOUND)
add_library(${TARGET_NAME} ${antennatools_SOURCES})
else()
qt_add_plugin(${TARGET_NAME} CLASS_NAME AntennaToolsPlugin ${antennatools_SOURCES})
endif()
if(NOT BUILD_SHARED_LIBS)
set_property(GLOBAL APPEND PROPERTY STATIC_PLUGINS_PROPERTY ${TARGET_NAME})
endif()
target_link_libraries(${TARGET_NAME}
target_link_libraries(${TARGET_NAME} PRIVATE
Qt::Core
${TARGET_LIB}
sdrbase

5
sdrbase/plugin/pluginmanager.cpp

@ -81,7 +81,10 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir) @@ -81,7 +81,10 @@ void PluginManager::loadPluginsPart(const QString& pluginsSubDir)
// on make install [PREFIX]/bin and [PREFIX]/lib/sdrangel
#if defined(ANDROID)
PluginsPath = QStringList({applicationDirPath});
filter = QStringList({"libsdrangel_" + pluginsSubDir + "_*.so"});
// Qt5 add_library gives libsdrangel_plugins_antennatools.so
// Qt6 qt_add_plugin gives libplugins__sdrangel_plugins_antennatools.so
// Assuming PLUGINS_PREFIX=sdrangel_plugins_
filter = QStringList({"lib*sdrangel_" + pluginsSubDir + "_*.so"});
#else
filter = QStringList({"*"});
PluginsPath << applicationDirPath + "/../" + LIB + "/sdrangel/" + pluginsSubDir;

Loading…
Cancel
Save