Skip to content

Commit

Permalink
Merge pull request #21082 from zhsj/fix-java9
Browse files Browse the repository at this point in the history
cmake: bump target jdk to 1.7

Reviewed-by: Wido den Hollander <wido@42on.com>
  • Loading branch information
tchaikov committed Mar 29, 2018
2 parents bff0d38 + 7c511d7 commit 98d766a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/java/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ set(java_srcs
java/com/ceph/fs/CephStat.java
java/com/ceph/fs/CephStatVFS.java)

# note: for the -source 1.5 builds, we add
# note: for the -source 1.7 builds, we add
# -Xlint:-options
# to get rid of the warning
# warning: [options] bootstrap class path not set in conjunction with -source 1.5
# warning: [options] bootstrap class path not set in conjunction with -source 1.7
# as per
# https://blogs.oracle.com/darcy/entry/bootclasspath_older_source
set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.5" "-target" "1.5" "-Xlint:-options")
set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.7" "-target" "1.7" "-Xlint:-options")
add_jar(libcephfs ${java_srcs})
install_jar(libcephfs share/java)
get_property(libcephfs_jar TARGET libcephfs PROPERTY JAR_FILE)
Expand Down

0 comments on commit 98d766a

Please sign in to comment.