Skip to content

Commit 675107b

Browse files
committed
Use addon factory v2
1 parent c14cc70 commit 675107b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.6)
22

33
project(fcitx5-bamboo VERSION 1.0.6)
44

5+
set(REQUIRED_FCITX_VERSION 5.1.12)
56
find_package(ECM 1.0.0 REQUIRED)
67
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
78
include(FeatureSummary)
89
include(GNUInstallDirs)
910
include(ECMUninstallTarget)
1011

11-
find_package(Fcitx5Core 5.0.22 REQUIRED)
12+
find_package(Fcitx5Core ${REQUIRED_FCITX_VERSION} REQUIRED)
1213
find_package(Fcitx5Module REQUIRED COMPONENTS TestFrontend)
1314
find_package(Gettext REQUIRED)
1415
find_package(Pthread REQUIRED)

src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set( fcitx_bamboo_sources
33
bamboo.cpp
44
)
55

6-
add_library(bamboo MODULE ${fcitx_bamboo_sources})
6+
add_fcitx5_addon(bamboo ${fcitx_bamboo_sources})
77
target_link_libraries(bamboo Fcitx5::Core Fcitx5::Config Bamboo::Core Pthread::Pthread)
88
target_include_directories(bamboo PRIVATE ${PROJECT_BINARY_DIR})
99
install(TARGETS bamboo DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")

src/bamboo-addon.conf.in.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ OnDemand=True
99
Configurable=True
1010

1111
[Dependencies]
12-
0=core:5.0.22
12+
0=core:@REQUIRED_FCITX_VERSION@

0 commit comments

Comments
 (0)