Skip to content

Commit

Permalink
Bump Java compatibility from 1.5 to 1.6 (#1263)
Browse files Browse the repository at this point in the history
  • Loading branch information
jiapei100 authored Sep 23, 2020
1 parent 0f16986 commit 65c8f57
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/bin/jpip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ add_executable(${exe} ${exe}.c)
endforeach()

# Build the two java clients:
find_package(Java 1.5 COMPONENTS Development) # javac, jar
find_package(Java 1.6 COMPONENTS Development) # javac, jar

# User can override this:
if(NOT DEFINED JAVA_SOURCE_VERSION)
set(JAVA_SOURCE_VERSION 1.5)
set(JAVA_SOURCE_VERSION 1.6)
endif()
if(NOT DEFINED JAVA_TARGET_VERSION)
set(JAVA_TARGET_VERSION 1.5)
set(JAVA_TARGET_VERSION 1.6)
endif()

# Only build the java viewer if dev is found:
Expand Down
2 changes: 1 addition & 1 deletion wrapping/java/openjp2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ install(TARGETS openjpegjni
)

# build jar:
find_package(Java 1.5 REQUIRED) # javac, jar
find_package(Java 1.6 REQUIRED) # javac, jar

# build dep list:
file(GLOB java_srcs "java-sources/org/openJpeg/*.java")
Expand Down

0 comments on commit 65c8f57

Please sign in to comment.