diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-04-01 11:54:43 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-04-01 11:54:43 +0000 |
| commit | 78053c44c8ff121d3def4256b83966626d3ea684 (patch) | |
| tree | 1eef931ae5affa3654d1346e141a05cb2e94f003 /applications/JavaOpenJPEG/CMakeLists.txt | |
| parent | 902fe2569c673af27ab8933e1712e128e68cb6d4 (diff) | |
[1.5] Make sure to compile java code with a defined source/target version
Diffstat (limited to 'applications/JavaOpenJPEG/CMakeLists.txt')
| -rw-r--r-- | applications/JavaOpenJPEG/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/applications/JavaOpenJPEG/CMakeLists.txt b/applications/JavaOpenJPEG/CMakeLists.txt index 477ba749..db8f4ef5 100644 --- a/applications/JavaOpenJPEG/CMakeLists.txt +++ b/applications/JavaOpenJPEG/CMakeLists.txt @@ -41,6 +41,14 @@ INSTALL(TARGETS openjpegjni # build jar: FIND_PACKAGE(Java 1.5 REQUIRED) # javac, jar +# User can override this: +if(NOT DEFINED JAVA_SOURCE_VERSION) + set(JAVA_SOURCE_VERSION 1.5) +endif() +if(NOT DEFINED JAVA_TARGET_VERSION) + set(JAVA_TARGET_VERSION 1.5) +endif() + # build dep list: file(GLOB java_srcs "java-sources/org/openJpeg/*.java") @@ -49,7 +57,9 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes) # Build java ADD_CUSTOM_COMMAND( OUTPUT ${LIBRARY_OUTPUT_PATH}/openjpeg.jar - COMMAND ${Java_JAVAC_EXECUTABLE} -sourcepath "${CMAKE_CURRENT_SOURCE_DIR}/java-sources" + COMMAND ${Java_JAVAC_EXECUTABLE} + -source ${JAVA_SOURCE_VERSION} -target ${JAVA_TARGET_VERSION} + -sourcepath "${CMAKE_CURRENT_SOURCE_DIR}/java-sources" ${java_srcs} -d ${CMAKE_CURRENT_BINARY_DIR}/classes COMMAND ${Java_JAR_EXECUTABLE} cvf ${LIBRARY_OUTPUT_PATH}/openjpeg.jar org WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/classes |