build(jni): more neat way to find headers

WhiredPlanck · Nov 13, 2023 · 769d2d8 · 769d2d8
1 parent db1581f
commit 769d2d8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 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})
 
+set(CMAKE_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/librime/include")
+
 # general options
 option(BUILD_SHARED_LIBS "" OFF)
 option(BUILD_TESTING "" OFF)
@@ -53,17 +55,10 @@ option(LEVELDB_INSTALL "" OFF)
 add_subdirectory(librime/deps/leveldb)
 
 add_subdirectory(OpenCC)
-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,3 @@
 set(Glog_FOUND TRUE)
 set(Glog_LIBRARY glog)
+set(Glog_INCLUDE_PATH "${CMAKE_BINARY_DIR}/librime/deps/glog" "${CMAKE_SOURCE_DIR}/librime/deps/glog/src")
diff --git a/app/src/main/jni/cmake/FindOpencc.cmake b/app/src/main/jni/cmake/FindOpencc.cmake
@@ -1,3 +1,3 @@
 set(Opencc_FOUND TRUE)
 set(Opencc_LIBRARY libopencc)
-set(Opencc_INCLUDE_PATH "${CMAKE_BINARY_DIR}/include")
+set(Opencc_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/OpenCC/src" "${CMAKE_BINARY_DIR}/OpenCC/src")
diff --git a/app/src/main/jni/cmake/OpenccWorkarounds.cmake b/app/src/main/jni/cmake/OpenccWorkarounds.cmake