Use addon factory v2

fcitx · Jan 18, 2025 · 4e10afa · 4e10afa
1 parent 254eae8
commit 4e10afa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.6)
 
 project(fcitx-m17n VERSION 5.1.2)
 
+set(REQUIRED_FCITX_VERSION 5.1.12)
 find_package(ECM REQUIRED 1.0.0)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 include(FeatureSummary)
@@ -12,7 +13,7 @@ option(ENABLE_TEST "Build Test" On)
 option(ENABLE_COVERAGE "Build the project with gcov support (Need ENABLE_TEST=On)" Off)
 set(GCOV_TOOL "gcov" CACHE STRING "Path to gcov tool used by coverage.")
 
-find_package(Fcitx5Core 5.0.2 REQUIRED)
+find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
 find_package(Fcitx5Module REQUIRED COMPONENTS TestFrontend)
 find_package(Gettext REQUIRED)
 find_package(fmt REQUIRED)

diff --git a/im/CMakeLists.txt b/im/CMakeLists.txt
@@ -4,7 +4,7 @@ set(fcitx_m17n_sources
     keysymname.cpp
     )
 
-add_library(m17n MODULE ${fcitx_m17n_sources})
+add_fcitx5_addon(m17n ${fcitx_m17n_sources})
 target_link_libraries(m17n Fcitx5::Core Fcitx5::Config ${FMT_TARGET} PkgConfig::M17NGui)
 target_include_directories(m17n PRIVATE ${PROJECT_BINARY_DIR})
 set_target_properties(m17n PROPERTIES PREFIX "")

diff --git a/im/engine.cpp b/im/engine.cpp
@@ -624,4 +624,4 @@ void M17NState::select(int index) {
 }
 } // namespace fcitx
 
-FCITX_ADDON_FACTORY(fcitx::M17NEngineFactory)
+FCITX_ADDON_FACTORY_V2(m17n, fcitx::M17NEngineFactory)
diff --git a/im/m17n.conf.in.in b/im/m17n.conf.in.in
@@ -7,3 +7,6 @@ Enabled=True
 Library=m17n
 Type=SharedLibrary
 Configurable=True
+
+[Addon/Dependencies]
+0=core:@REQUIRED_FCITX_VERSION@