Skip to content

Commit b3bb0d3

Browse files
committed
Support no server build for fcitx
1 parent a68cc09 commit b3bb0d3

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if (BUILD_TOOL)
5252
add_subdirectory(gui)
5353
endif()
5454

55-
if (BUILD_SERVER)
55+
if (BUILD_SERVER AND ENABLE_SERVER)
5656
add_subdirectory(server)
5757
endif()
5858

fcitx/CMakeLists.txt

+16-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ add_library(fcitx5-mozc MODULE
77
${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_client_pool.cc
88
${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_engine_factory.cc
99
${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_engine.cc
10-
${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_ipc_client.cc
1110
${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_response_parser.cc
1211
${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_state.cc
1312
)
13+
1414
set_target_properties(fcitx5-mozc PROPERTIES PREFIX "")
1515

1616
target_link_libraries(fcitx5-mozc
@@ -20,8 +20,21 @@ target_link_libraries(fcitx5-mozc
2020
mozc::base::vlog
2121
mozc::base::process
2222
mozc::base::util
23-
mozc::base::init_mozc
24-
mozc::client::client)
23+
mozc::base::init_mozc)
24+
25+
if (ENABLE_SERVER)
26+
target_sources(fcitx5-mozc PRIVATE ${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_ipc_client.cc)
27+
target_link_libraries(fcitx5-mozc mozc::client::client)
28+
else()
29+
target_sources(fcitx5-mozc PRIVATE ${MOZC_SOURCE_DIR}/unix/fcitx5/mozc_direct_client.cc)
30+
target_link_libraries(fcitx5-mozc
31+
mozc::session::session_usage_observer
32+
mozc::engine::engine
33+
mozc::session::key_info_util
34+
mozc::session::session_handler
35+
mozc::data_manager::oss::oss_data_manager)
36+
endif()
37+
2538
install(TARGETS fcitx5-mozc DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5")
2639
install(FILES ${MOZC_SOURCE_DIR}/unix/fcitx5/mozc-addon.conf RENAME mozc.conf DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon"
2740
COMPONENT config)

0 commit comments

Comments
 (0)