RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: use javac -h for creating JNI native headers

Browse Source 
JDK 1.10 does not offer javah anymore, so we need to use "javac -h" or
add_jar(... GENERATE_NATIVE_HEADERS) instead.

Fixes: http://tracker.ceph.com/issues/24012
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit edc504b9d4)
This commit is contained in:
Kefu Chai 2018-05-04 22:32:35 +08:00
parent 303e71fe07
commit 3731560bda
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/CMakeLists.txt
View File

@ -22,18 +22,21 @@ set(java_srcs
# as per
# https://blogs.oracle.com/darcy/entry/bootclasspath_older_source
set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.7" "-target" "1.7" "-Xlint:-options")
add_jar(libcephfs ${java_srcs})
install_jar(libcephfs share/java)
set(jni_header_dir "${CMAKE_CURRENT_BINARY_DIR}/native")
if(CMAKE_VERSION VERSION_LESS 3.11)
set(CMAKE_JAVA_COMPILE_FLAGS ${CMAKE_JAVA_COMPILE_FLAGS} "-h" ${jni_header_dir})
add_jar(libcephfs ${java_srcs})
add_custom_target(
jni-header
DEPENDS libcephfs)
add_dependencies(jni-header libcephfs)
else()
add_jar(libcephfs ${java_srcs}
GENERATE_NATIVE_HEADERS jni-header
DESTINATION ${jni_header_dir})
endif()
get_property(libcephfs_jar TARGET libcephfs PROPERTY JAR_FILE)
set(java_h native/com_ceph_fs_CephMount.h)
add_custom_command(
OUTPUT ${java_h}
COMMAND ${Java_JAVAH_EXECUTABLE} -classpath ${libcephfs_jar} -jni -o ${CMAKE_CURRENT_BINARY_DIR}/${java_h} com.ceph.fs.CephMount)
add_custom_target(
jni-header
DEPENDS ${java_h})
add_dependencies(jni-header libcephfs)
install_jar(libcephfs share/java)
find_jar(JUNIT_JAR
NAMES junit4 junit