From 388d72605e22c872619fb1cc4c4eebd4693f6f52 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Sun, 8 Dec 2024 20:55:26 -0500 Subject: [PATCH] support static addon --- CMakeLists.txt | 2 +- src/addonloader/CMakeLists.txt | 2 +- src/addonloader/luaaddonloader.conf.in.in | 2 +- src/addonloader/luaaddonloader.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5da1e8a..00a9446 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ include(ECMSetupVersion) include(ECMUninstallTarget) find_package(Lua 5.3 REQUIRED) -find_package(Fcitx5Core REQUIRED) +find_package(Fcitx5Core 5.1.12 REQUIRED) find_package(Gettext REQUIRED) find_package(Pthread REQUIRED) find_package(Fcitx5Module REQUIRED COMPONENTS QuickPhrase) diff --git a/src/addonloader/CMakeLists.txt b/src/addonloader/CMakeLists.txt index 71b6ff1..9169b30 100644 --- a/src/addonloader/CMakeLists.txt +++ b/src/addonloader/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(luaaddonloader MODULE luastate.cpp luaaddonstate.cpp luaaddonloader.cpp luaaddon.cpp luahelper.cpp) +add_fcitx5_addon(luaaddonloader luastate.cpp luaaddonstate.cpp luaaddonloader.cpp luaaddon.cpp luahelper.cpp) target_link_libraries(luaaddonloader Lua::_LuaLibrary Fcitx5::Core Fcitx5::Module::QuickPhrase) target_include_directories(luaaddonloader PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) install(TARGETS luaaddonloader DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5") diff --git a/src/addonloader/luaaddonloader.conf.in.in b/src/addonloader/luaaddonloader.conf.in.in index cf8e488..b16f394 100644 --- a/src/addonloader/luaaddonloader.conf.in.in +++ b/src/addonloader/luaaddonloader.conf.in.in @@ -3,7 +3,7 @@ Name=Lua Addon Loader Comment=Lua Addon support Category=Module Version=@PROJECT_VERSION@ -Type=SharedLibrary +Type=@FCITX_ADDON_TYPE@ OnDemand=True Configurable=False Library=libluaaddonloader diff --git a/src/addonloader/luaaddonloader.cpp b/src/addonloader/luaaddonloader.cpp index b5951d3..f10f9c3 100644 --- a/src/addonloader/luaaddonloader.cpp +++ b/src/addonloader/luaaddonloader.cpp @@ -84,4 +84,4 @@ AddonInstance *LuaAddonLoaderFactory::create(AddonManager *manager) { } // namespace fcitx -FCITX_ADDON_FACTORY(fcitx::LuaAddonLoaderFactory); +FCITX_ADDON_FACTORY_V2(luaaddonloader, fcitx::LuaAddonLoaderFactory)