walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Bump Java compatibility from 1.5 to 1.6 (#1263)

This commit is contained in:
Pei JIA 2020-09-23 02:34:31 -07:00 committed by GitHub
parent 0f16986738
commit 65c8f577d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/jpip/CMakeLists.txt
View File

@ -57,14 +57,14 @@ add_executable(${exe} ${exe}.c)
endforeach() endforeach()
# Build the two java clients: # 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: # User can override this:
if(NOT DEFINED JAVA_SOURCE_VERSION) if(NOT DEFINED JAVA_SOURCE_VERSION)
set(JAVA_SOURCE_VERSION 1.5) set(JAVA_SOURCE_VERSION 1.6)
endif() endif()
if(NOT DEFINED JAVA_TARGET_VERSION) if(NOT DEFINED JAVA_TARGET_VERSION)
set(JAVA_TARGET_VERSION 1.5) set(JAVA_TARGET_VERSION 1.6)
endif() endif()
# Only build the java viewer if dev is found: # Only build the java viewer if dev is found:

2
wrapping/java/openjp2/CMakeLists.txt
View File

@ -44,7 +44,7 @@ install(TARGETS openjpegjni
) )
# build jar: # build jar:
find_package(Java 1.5 REQUIRED) # javac, jar find_package(Java 1.6 REQUIRED) # javac, jar
# build dep list: # build dep list:
file(GLOB java_srcs "java-sources/org/openJpeg/*.java") file(GLOB java_srcs "java-sources/org/openJpeg/*.java")