support static addon (#27)

eagleoflqj · web-flow · commit 1d28eb32951d · 2024-12-08T18:41:38.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -84,4 +84,4 @@ AddonInstance *LuaAddonLoaderFactory::create(AddonManager *manager) {
 
 } // namespace fcitx
 
-FCITX_ADDON_FACTORY(fcitx::LuaAddonLoaderFactory);
+FCITX_ADDON_FACTORY_V2(luaaddonloader, fcitx::LuaAddonLoaderFactory)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-add_library(luaaddonloader MODULE luastate.cpp luaaddonstate.cpp luaaddonloader.cpp luaaddon.cpp luahelper.cpp)`
	`1`	`+add_fcitx5_addon(luaaddonloader luastate.cpp luaaddonstate.cpp luaaddonloader.cpp luaaddon.cpp luahelper.cpp)`
`2`	`2`	`target_link_libraries(luaaddonloader Lua::_LuaLibrary Fcitx5::Core Fcitx5::Module::QuickPhrase)`
`3`	`3`	`target_include_directories(luaaddonloader PRIVATE ${CMAKE_CURRENT_BINARY_DIR})`
`4`	`4`	`install(TARGETS luaaddonloader DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")`
Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,4 @@ AddonInstance LuaAddonLoaderFactory::create(AddonManager manager) {`
`84`	`84`
`85`	`85`	`} // namespace fcitx`
`86`	`86`
`87`		`-FCITX_ADDON_FACTORY(fcitx::LuaAddonLoaderFactory);`
	`87`	`+FCITX_ADDON_FACTORY_V2(luaaddonloader, fcitx::LuaAddonLoaderFactory)`