Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 93f25a8

Browse filesBrowse files
rockarocka
committed
Update prebuilt
use boost 1.83.0 built by cmake
1 parent e1b7f9b commit 93f25a8
Copy full SHA for 93f25a8

File tree

Expand file treeCollapse file tree

5 files changed

+8
-9
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+8
-9
lines changed

‎app/src/main/cpp/CMakeLists.txt

Copy file name to clipboardExpand all lines: app/src/main/cpp/CMakeLists.txt
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ set(Libevent_DIR "${PREBUILT_DIR}/libevent/${ANDROID_ABI}/lib/cmake/libevent")
4141
find_package(Libevent)
4242

4343
# prebuilt boost
44-
set(BOOST_VERSION "1.80.0")
4544
list(APPEND CMAKE_FIND_ROOT_PATH "${PREBUILT_DIR}/boost/${ANDROID_ABI}/lib/cmake")
46-
find_package(Boost 1.80 REQUIRED COMPONENTS headers filesystem iostreams)
45+
find_package(Boost 1.83.0 REQUIRED COMPONENTS headers filesystem iostreams CONFIG)
4746

4847
add_library(native-lib SHARED native-lib.cpp)
4948
target_link_libraries(native-lib

‎lib/fcitx5-chinese-addons/src/main/cpp/CMakeLists.txt

Copy file name to clipboardExpand all lines: lib/fcitx5-chinese-addons/src/main/cpp/CMakeLists.txt
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
3939
find_package(fmt)
4040

4141
# prebuilt boost
42-
set(BOOST_VERSION "1.80.0")
4342
list(APPEND CMAKE_FIND_ROOT_PATH "${PREBUILT_DIR}/boost/${ANDROID_ABI}/lib/cmake")
44-
find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS iostreams CONFIG)
43+
find_package(Boost 1.83.0 REQUIRED COMPONENTS iostreams CONFIG)
4544

4645
# prebuilt marisa-tire, OpenCC needs it
4746
set(marisa_DIR "${PREBUILT_DIR}/marisa/${ANDROID_ABI}/lib/cmake/marisa")

‎lib/fcitx5/src/main/cpp/cmake/FindZLIB.cmake

Copy file name to clipboardExpand all lines: lib/fcitx5/src/main/cpp/cmake/FindZLIB.cmake
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
find_library(ZLIB z)
2-
add_library(ZLIB::ZLIB SHARED IMPORTED)
3-
set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${ZLIB})
2+
if(NOT TARGET ZLIB::ZLIB)
3+
add_library(ZLIB::ZLIB SHARED IMPORTED)
4+
set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${ZLIB})
5+
endif()
46
set(ZLIB_LIBRARIES ${ZLIB})
57
set(ZLIB_INCLUDE_DIRS "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/include")
68
set(ZLIB_FOUND TRUE)

‎lib/fcitx5/src/main/cpp/prebuilt

Copy file name to clipboard
Submodule prebuilt updated 6875 files

‎lib/libime/src/main/cpp/CMakeLists.txt

Copy file name to clipboardExpand all lines: lib/libime/src/main/cpp/CMakeLists.txt
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ set(fmt_DIR "${PREBUILT_DIR}/fmt/${ANDROID_ABI}/lib/cmake/fmt")
2424
find_package(fmt)
2525

2626
# prebuilt boost
27-
set(BOOST_VERSION "1.80.0")
2827
list(APPEND CMAKE_FIND_ROOT_PATH "${PREBUILT_DIR}/boost/${ANDROID_ABI}/lib/cmake")
29-
find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS filesystem iostreams CONFIG)
28+
find_package(Boost 1.83.0 REQUIRED COMPONENTS filesystem iostreams CONFIG)
3029

3130
# prebuilt zstd
3231
set(zstd_DIR "${PREBUILT_DIR}/zstd/${ANDROID_ABI}/lib/cmake/zstd")

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.