Bump Java compatibility from 1.5 to 1.6 (#1263)
This commit is contained in:
parent
0f16986738
commit
65c8f577d2
|
@ -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:
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue