Clang-tidy and use addon factory v2

fcitx · Jan 18, 2025 · a54e585 · a54e585
1 parent 1c18d99
commit a54e585
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 74 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.6.0)
 project(fcitx5-skk VERSION 5.1.5)
 
+set(REQUIRED_FCITX_VERSION 5.1.12)
 find_package(ECM 1.0.0 REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) 
 option(ENABLE_QT "Enable Qt for GUI configuration" On)
@@ -10,7 +11,7 @@ include(ECMUninstallTarget)
 include(FeatureSummary)
 
 find_package(PkgConfig REQUIRED)
-find_package(Fcitx5Core 5.0.6 REQUIRED)
+find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
 find_package(Gettext REQUIRED)
 pkg_check_modules(GObject2 IMPORTED_TARGET "gobject-2.0" REQUIRED)
 find_package(LibSKK REQUIRED)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(SKK_SOURCES
     skk.cpp
 )
-add_library(skk MODULE ${SKK_SOURCES})
+add_fcitx5_addon(skk ${SKK_SOURCES})
 target_link_libraries(skk
     Fcitx5::Core
     Fcitx5::Config

diff --git a/src/skk-addon.conf.in.in b/src/skk-addon.conf.in.in
@@ -7,3 +7,6 @@ Library=skk
 Type=SharedLibrary
 OnDemand=True
 Configurable=True
+
+[Addon/Dependencies]
+0=core:@REQUIRED_FCITX_VERSION@