build(jni): more neat way to find headers

WhiredPlanck · Nov 15, 2023 · 5492d20 · 5492d20
1 parent db1581f
commit 5492d20
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/app/src/main/jni/CMakeLists.txt b/app/src/main/jni/CMakeLists.txt
@@ -7,6 +7,8 @@ set(CMAKE_CXX_STANDARD 14)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
+list(APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_SOURCE_DIR}/librime/include")
+
 # general options
 option(BUILD_SHARED_LIBS "" OFF)
 option(BUILD_TESTING "" OFF)
@@ -58,12 +60,6 @@ include(OpenccWorkarounds)
 include(RimePlugins)
 
 option(BUILD_TEST "" OFF)
-include_directories(
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/librime/include"
-    PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/librime/deps/glog"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/librime/deps/glog/src"
-)
-
 add_subdirectory(librime)
 
 add_subdirectory(librime_jni)
diff --git a/app/src/main/jni/cmake/FindGlog.cmake b/app/src/main/jni/cmake/FindGlog.cmake
@@ -1,2 +1,4 @@
 set(Glog_FOUND TRUE)
 set(Glog_LIBRARY glog)
+get_target_property(Glog_INCLUDE_PATH glog::glog
+    INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/app/src/main/jni/cmake/FindYamlCpp.cmake b/app/src/main/jni/cmake/FindYamlCpp.cmake
@@ -1,2 +1,2 @@
-set(YamlCpp_FOUNT TRUE)
+set(YamlCpp_FOUND TRUE)
 set(YamlCpp_LIBRARY yaml-cpp)
diff --git a/app/src/main/jni/cmake/OpenccWorkarounds.cmake b/app/src/main/jni/cmake/OpenccWorkarounds.cmake
@@ -1,10 +1,7 @@
-# install opencc headers manually
+# Since OpenCC doesn't include its headers in the binary dir,
+# we need to install them manually.
 file(GLOB LIBOPENCC_HEADERS
-  OpenCC/src/*.hpp
-  OpenCC/src/*.h
-  "${CMAKE_BINARY_DIR}/OpenCC/src/opencc_config.h"
+    OpenCC/src/*.hpp
+    "${CMAKE_BINARY_DIR}/OpenCC/src/opencc_config.h"
 )
-make_directory("${CMAKE_BINARY_DIR}/include/opencc")
-foreach(header ${LIBOPENCC_HEADERS})
-  configure_file(${header} "${CMAKE_BINARY_DIR}/include/opencc" COPYONLY)
-endforeach()
+file(COPY ${LIBOPENCC_HEADERS} DESTINATION "${CMAKE_BINARY_DIR}/include/opencc")
diff --git a/app/src/main/jni/librime_jni/CMakeLists.txt b/app/src/main/jni/librime_jni/CMakeLists.txt
@@ -1,17 +1,17 @@
 find_package(Opencc REQUIRED)
 
-file(GLOB RIME_JNI_SOURCES
+set(RIME_JNI_SOURCES
   key_table.cc
   levers.cc
   opencc.cc
   rime_jni.cc
 )
 add_library(rime_jni SHARED ${RIME_JNI_SOURCES})
+target_link_libraries(rime_jni log rime-static ${Opencc_LIBRARY})
 target_include_directories(rime_jni PRIVATE
   "${CMAKE_SOURCE_DIR}/librime/src"
   "${Opencc_INCLUDE_PATH}"
 )
-target_link_libraries(rime_jni rime-static log ${Opencc_LIBRARY})
 
 string(TIMESTAMP TODAY "%Y%m%d")
 execute_process(