Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Java compatibility from 1.5 to 1.6 #1263

Merged
merged 2 commits into from
Sep 23, 2020
Merged

Java compatibility from 1.5 to 1.6 #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7935147
Java Support 1.6
jiapei100 Jul 4, 2020
01253ef
Remove build folder
jiapei100 Jul 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/bin/jpip/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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