gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #246 from zerotier/brenton/jni-work

Browse Source 
Fix fatal error: jni_md.h: No such file or directory
This commit is contained in:
Joseph Henry
2023-08-19 08:44:35 -07:00
committed by GitHub
parent 67cdb5993c 189576719b
commit d5ffe38904
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
CMakeLists.txt
View File

@@ -82,8 +82,6 @@ endif()
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# | INCLUDE DIRECTORIES | # | INCLUDE DIRECTORIES |
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Temporary measure to test GitHub workflow on Ubuntu
include_directories(/usr/lib/jvm/java-11-openjdk-amd64/include/linux/)
# ZeroTier # ZeroTier
include_directories(${ZTO_SRC_DIR}) include_directories(${ZTO_SRC_DIR})
include_directories(${ZTO_SRC_DIR}/include) include_directories(${ZTO_SRC_DIR}/include)
@@ -471,37 +469,40 @@ endif()
if(ZTS_ENABLE_JAVA OR (BUILD_ANDROID AND NOT ZTS_NDK_ONLY)) if(ZTS_ENABLE_JAVA OR (BUILD_ANDROID AND NOT ZTS_NDK_ONLY))
message(STATUS "Looking for JNI") message(STATUS "Looking for JNI")
message(STATUS "Ignore seeing \"Found JNI: NotNeeded\" below; check that JNI_INCLUDE_DIRS is valid")
if(BUILD_WIN) #
# We are only interested in finding jni.h: we do not care about extended JVM # "trick" CMake into thinking that we have already found these
# functionality or the AWT library. set(JAVA_AWT_LIBRARY NotNeeded) # https://stackoverflow.com/a/51764145
# set(JAVA_JVM_LIBRARY NotNeeded) set(JAVA_INCLUDE_PATH2 NotNeeded) #
# set(JAVA_AWT_INCLUDE_PATH NotNeeded) # These may be missing, but we do not need them
set(JAVA_INCLUDE_PATH "C:\\Program Files\\Java\\jdk-10.0.2\\include") #
endif() # There is no official way of telling CMake: "skip looking for AWT, etc."
#
set(JAVA_AWT_LIBRARY NotNeeded) set(JAVA_AWT_LIBRARY NotNeeded)
set(JAVA_JVM_LIBRARY NotNeeded) set(JAVA_JVM_LIBRARY NotNeeded)
set(JAVA_INCLUDE_PATH2 NotNeeded)
set(JAVA_AWT_INCLUDE_PATH NotNeeded) set(JAVA_AWT_INCLUDE_PATH NotNeeded)
find_package(JNI REQUIRED)
#
# Do NOT make REQUIRED
# Until there is an official way of telling CMake to skip AWT, etc.,
# then JNI will be considered as "not found"
#
find_package(JNI)
if(JNI_FOUND) list(FILTER JNI_INCLUDE_DIRS EXCLUDE REGEX NotNeeded)
message(STATUS "JNI_INCLUDE_DIR=${JNI_INCLUDE_DIRS}") list(FILTER JNI_LIBRARIES EXCLUDE REGEX NotNeeded)
message(STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
list(GET JNI_INCLUDE_DIRS 0 JNI_INCLUDE_DIR) #
message(STATUS "jni path=${JNI_INCLUDE_DIR}") # Do NOT check JNI_FOUND here, check JNI_INCLUDE_DIRS instead
include_directories("${JNI_INCLUDE_DIR}") # because of setting the above variables to NotNeeded,
# include_directories ("${JNI_INCLUDE_DIRS}") # the variable JNI_FOUND is now set to NotNeeded, which is annoying
if(BUILD_WIN) #
include_directories("${JNI_INCLUDE_DIR}\\win32") # We only care about JNI_INCLUDE_DIRS
endif() #
if(BUILD_MACOS) if(JNI_INCLUDE_DIRS)
include_directories("${JNI_INCLUDE_DIR}/darwin") message(STATUS "JNI_INCLUDE_DIRS: ${JNI_INCLUDE_DIRS}")
endif() include_directories("${JNI_INCLUDE_DIRS}")
if(BUILD_LINUX)
include_directories("${JNI_INCLUDE_DIR}/linux")
endif()
else() else()
message(STATUS "JNI not found") message(STATUS "JNI not found")
endif() endif()