Skip to content

Commit a54e585

Browse files
committed
Clang-tidy and use addon factory v2
1 parent 1c18d99 commit a54e585

File tree

5 files changed

+127
-74
lines changed

5 files changed

+127
-74
lines changed

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cmake_minimum_required(VERSION 3.6.0)
22
project(fcitx5-skk VERSION 5.1.5)
33

4+
set(REQUIRED_FCITX_VERSION 5.1.12)
45
find_package(ECM 1.0.0 REQUIRED)
56
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
67
option(ENABLE_QT "Enable Qt for GUI configuration" On)
@@ -10,7 +11,7 @@ include(ECMUninstallTarget)
1011
include(FeatureSummary)
1112

1213
find_package(PkgConfig REQUIRED)
13-
find_package(Fcitx5Core 5.0.6 REQUIRED)
14+
find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
1415
find_package(Gettext REQUIRED)
1516
pkg_check_modules(GObject2 IMPORTED_TARGET "gobject-2.0" REQUIRED)
1617
find_package(LibSKK REQUIRED)

src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set(SKK_SOURCES
33
skk.cpp
44
)
5-
add_library(skk MODULE ${SKK_SOURCES})
5+
add_fcitx5_addon(skk ${SKK_SOURCES})
66
target_link_libraries(skk
77
Fcitx5::Core
88
Fcitx5::Config

src/skk-addon.conf.in.in

+3
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ Library=skk
77
Type=SharedLibrary
88
OnDemand=True
99
Configurable=True
10+
11+
[Addon/Dependencies]
12+
0=core:@REQUIRED_FCITX_VERSION@

0 commit comments

Comments
 (0)