Skip to content

Commit

Permalink
reduce libime patch
Browse files Browse the repository at this point in the history
  • Loading branch information
eagleoflqj committed Nov 28, 2024
1 parent ea92131 commit e3e9663
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set(BUNDLE_IDENTIFIER "org.fcitx.Fcitx5")
set(BUNDLE_NAME "Fcitx5")
set(ICON_FILE "icon.icns")

set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

if (IOS_PLATFORM STREQUAL "SIMULATOR")
set(F5I_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator")
Expand Down Expand Up @@ -110,6 +110,8 @@ if (CHINESE_ADDONS)
set(HAS_STD_FILESYSTEM 1)
set(BUILD_TOOLS OFF)
add_subdirectory(engines/libime)
# suppress configure error
install(TARGETS kenlm EXPORT LibIMECoreTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
add_subdirectory(engines/fcitx5-chinese-addons)
list(APPEND ADDONS chttrans fullwidth pinyin pinyinhelper punctuation table)
list(APPEND DEFAULT_INPUT_METHODS pinyin shuangpin wbx)
Expand Down
11 changes: 1 addition & 10 deletions patches/libime.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/src/libime/core/CMakeLists.txt b/src/libime/core/CMakeLists.txt
index 35ee954..b1ada6a 100644
index 35ee954..e40a2dd 100644
--- a/src/libime/core/CMakeLists.txt
+++ b/src/libime/core/CMakeLists.txt
@@ -69,7 +69,7 @@ ecm_setup_version(PROJECT
Expand All @@ -11,15 +11,6 @@ index 35ee954..b1ada6a 100644
set_target_properties(IMECore
PROPERTIES VERSION ${IMECore_VERSION}
SOVERSION ${IMECore_SOVERSION}
@@ -82,7 +82,7 @@ target_include_directories(IMECore PUBLIC

target_link_libraries(IMECore PUBLIC Fcitx5::Utils Boost::boost PRIVATE kenlm Boost::iostreams PkgConfig::ZSTD)

-install(TARGETS IMECore EXPORT LibIMECoreTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
+install(TARGETS IMECore kenlm EXPORT LibIMECoreTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)
install(FILES ${LIBIME_HDRS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/LibIME/libime/core" COMPONENT header)

add_library(LibIME::Core ALIAS IMECore)
diff --git a/src/libime/pinyin/CMakeLists.txt b/src/libime/pinyin/CMakeLists.txt
index a5e6d35..601d559 100644
--- a/src/libime/pinyin/CMakeLists.txt
Expand Down

0 comments on commit e3e9663

Please sign in to comment.