Skip to content

Commit cfcc345

Browse files
committed
build(jni): replace miniglog with glog bundled by librime
1 parent 0afc710 commit cfcc345

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@
2828
[submodule "librime-charcode"]
2929
path = app/src/main/jni/librime-charcode
3030
url = https://github.com/rime/librime-charcode
31-
[submodule "app/src/main/jni/miniglog"]
32-
path = app/src/main/jni/miniglog
33-
url = https://github.com/iovxw/miniglog.git

app/src/main/jni/CMakeLists.txt

+11-6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@ install(TARGETS iconv EXPORT boost_locale-targets
2121
option(BOOST_FILESYSTEM_DISABLE_STATX "" ON) # remove this option after targetSdkVersion >= 30
2222
add_subdirectory(boost)
2323

24-
add_library(miniglog STATIC miniglog/miniglog/logging.cc)
25-
target_link_libraries(miniglog log)
26-
configure_file(
27-
"${CMAKE_CURRENT_LIST_DIR}/miniglog/miniglog/logging.h"
28-
"${CMAKE_BINARY_DIR}/include/glog/logging.h"
29-
COPYONLY
24+
option(WITH_GFLAGS "Use gflags" OFF)
25+
option(WITH_GTEST "Use googletest" OFF)
26+
option(WITH_UNWIND "Enable libunwind support" OFF)
27+
add_subdirectory(librime/deps/glog)
28+
file(INSTALL DESTINATION "${CMAKE_BINARY_DIR}/include/glog" TYPE FILE FILES
29+
"${CMAKE_BINARY_DIR}/librime/deps/glog/glog/export.h"
30+
"${CMAKE_BINARY_DIR}/librime/deps/glog/glog/logging.h"
31+
"${CMAKE_BINARY_DIR}/librime/deps/glog/glog/raw_logging.h"
32+
"${CMAKE_BINARY_DIR}/librime/deps/glog/glog/stl_logging.h"
33+
"${CMAKE_BINARY_DIR}/librime/deps/glog/glog/vlog_is_on.h"
34+
"librime/deps/glog/src/glog/log_severity.h"
3035
)
3136

3237
option(YAML_CPP_BUILD_TOOLS "" OFF)

app/src/main/jni/cmake/FindGlog.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
set(Glog_FOUND TRUE)
2-
set(Glog_LIBRARY miniglog)
2+
set(Glog_LIBRARY glog)

app/src/main/jni/miniglog

-1
This file was deleted.

0 commit comments

Comments
 (0)