Skip to content

Commit e3e9663

Browse files
committed
reduce libime patch
1 parent ea92131 commit e3e9663

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(BUNDLE_IDENTIFIER "org.fcitx.Fcitx5")
1212
set(BUNDLE_NAME "Fcitx5")
1313
set(ICON_FILE "icon.icns")
1414

15-
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
15+
list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
1616

1717
if (IOS_PLATFORM STREQUAL "SIMULATOR")
1818
set(F5I_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator")
@@ -110,6 +110,8 @@ if (CHINESE_ADDONS)
110110
set(HAS_STD_FILESYSTEM 1)
111111
set(BUILD_TOOLS OFF)
112112
add_subdirectory(engines/libime)
113+
# suppress configure error
114+
install(TARGETS kenlm EXPORT LibIMECoreTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
113115
add_subdirectory(engines/fcitx5-chinese-addons)
114116
list(APPEND ADDONS chttrans fullwidth pinyin pinyinhelper punctuation table)
115117
list(APPEND DEFAULT_INPUT_METHODS pinyin shuangpin wbx)

patches/libime.patch

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/src/libime/core/CMakeLists.txt b/src/libime/core/CMakeLists.txt
2-
index 35ee954..b1ada6a 100644
2+
index 35ee954..e40a2dd 100644
33
--- a/src/libime/core/CMakeLists.txt
44
+++ b/src/libime/core/CMakeLists.txt
55
@@ -69,7 +69,7 @@ ecm_setup_version(PROJECT
@@ -11,15 +11,6 @@ index 35ee954..b1ada6a 100644
1111
set_target_properties(IMECore
1212
PROPERTIES VERSION ${IMECore_VERSION}
1313
SOVERSION ${IMECore_SOVERSION}
14-
@@ -82,7 +82,7 @@ target_include_directories(IMECore PUBLIC
15-
16-
target_link_libraries(IMECore PUBLIC Fcitx5::Utils Boost::boost PRIVATE kenlm Boost::iostreams PkgConfig::ZSTD)
17-
18-
-install(TARGETS IMECore EXPORT LibIMECoreTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
19-
+install(TARGETS IMECore kenlm EXPORT LibIMECoreTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
20-
install(FILES ${LIBIME_HDRS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibIME/libime/core" COMPONENT header)
21-
22-
add_library(LibIME::Core ALIAS IMECore)
2314
diff --git a/src/libime/pinyin/CMakeLists.txt b/src/libime/pinyin/CMakeLists.txt
2415
index a5e6d35..601d559 100644
2516
--- a/src/libime/pinyin/CMakeLists.txt

0 commit comments

Comments
 (0)