Skip to content

Commit 1fe3909

Browse files
committed
disable testing addons
1 parent e3e9663 commit 1fe3909

File tree

6 files changed

+7
-39
lines changed

6 files changed

+7
-39
lines changed

CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@ set(PREBUILDER_INCLUDE_DIR "${FIND_ROOT_PATH}/include")
3535
set(PREBUILDER_LIB_DIR "${FIND_ROOT_PATH}/lib")
3636
set(PREBUILDER_SHARE_DIR "${FIND_ROOT_PATH}/share")
3737

38+
set(ENV{PKG_CONFIG_SYSROOT_DIR} "${PROJECT_BINARY_DIR}/sysroot")
39+
set(ENV{PKG_CONFIG_PATH} "${PREBUILDER_LIB_DIR}/pkgconfig")
40+
3841
list(APPEND CMAKE_FIND_ROOT_PATH "${FIND_ROOT_PATH}")
3942

4043
add_subdirectory(deps)
4144

45+
option(ENABLE_TESTING_ADDONS "" OFF)
4246
option(ENABLE_TEST "" OFF)
4347
option(ENABLE_COVERAGE "" OFF)
4448
option(ENABLE_ENCHANT "" OFF)
@@ -101,14 +105,13 @@ function(copy_to_app cmd file relative_path)
101105
endfunction()
102106

103107
if (CHINESE_ADDONS)
104-
find_package(OpenCC REQUIRED)
105108
option(ENABLE_GUI OFF)
106109
option(ENABLE_CLOUDPINYIN OFF)
107110
option(ENABLE_DATA OFF)
108111
add_definitions(-DCHINESE_ADDONS)
109112
set(_Fcitx5Macro_SELF_DIR "${PROJECT_SOURCE_DIR}/fcitx5/src/lib/fcitx-utils")
110113
set(HAS_STD_FILESYSTEM 1)
111-
set(BUILD_TOOLS OFF)
114+
set(ENABLE_TOOLS OFF)
112115
add_subdirectory(engines/libime)
113116
# suppress configure error
114117
install(TARGETS kenlm EXPORT LibIMECoreTargets LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib)

cmake/FindOpenCC.cmake

Lines changed: 0 additions & 8 deletions
This file was deleted.

patches/chinese-addons.patch

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index bd4ce71..c048801 100644
3-
--- a/CMakeLists.txt
4-
+++ b/CMakeLists.txt
5-
@@ -40,7 +40,7 @@ option(ENABLE_CLOUDPINYIN "Build cloud pinyin addon" On)
6-
option(USE_QT6 "Build with Qt6" On)
7-
option(ENABLE_DATA "Build data" On)
8-
9-
-if (ENABLE_OPENCC)
10-
+if (ENABLE_OPENCC AND NOT TARGET OpenCC::OpenCC)
11-
find_package(OpenCC 1.0.1 REQUIRED)
12-
endif()
13-
141
diff --git a/im/pinyin/CMakeLists.txt b/im/pinyin/CMakeLists.txt
152
index 4caf30b..ba4caa4 100644
163
--- a/im/pinyin/CMakeLists.txt

patches/fcitx5.patch

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 0d219a51..21695937 100644
3-
--- a/CMakeLists.txt
4-
+++ b/CMakeLists.txt
5-
@@ -224,9 +224,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DI
6-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
7-
8-
add_subdirectory(src)
9-
-add_subdirectory(data)
10-
add_subdirectory(po)
11-
-add_subdirectory(testing)
12-
13-
#######################################################################
14-
# Test features
151
diff --git a/src/lib/fcitx-config/CMakeLists.txt b/src/lib/fcitx-config/CMakeLists.txt
162
index 85c9865b..edf51a44 100644
173
--- a/src/lib/fcitx-config/CMakeLists.txt

0 commit comments

Comments
 (0)