tags 729515 patch
tags 729515 fixed-upstream
thanks
This has been fixed upstream with attached patch (git show 81c0859).
I am not going to do a source upload as it will interrfere with
current transitions (openjpeg+poppler).
commit 81c0859fe020441e912c0e30649792f3e9b81fc3
Author: Mathieu Malaterre <mathieu.malate...@gmail.com>
Date: Thu Nov 14 12:12:44 2013 +0100
Explicitely enforce Java 5 as target
This fixes http://bugs.debian.org/729515
diff --git a/CMake/FindJavaProperties.cmake b/CMake/FindJavaProperties.cmake
index 16255ef..b60eb5d 100644
--- a/CMake/FindJavaProperties.cmake
+++ b/CMake/FindJavaProperties.cmake
@@ -57,7 +57,7 @@ if(${current_list_path}/GetSystemProperty.java IS_NEWER_THAN ${CMAKE_BINARY_DIR}
#message("${current_list_path}/GetSystemProperty.java")
#message("${CMAKE_CURRENT_BINARY_DIR}/GetSystemProperty.class")
execute_process(
- COMMAND ${Java_JAVAC_EXECUTABLE} -source 1.5
+ COMMAND ${Java_JAVAC_EXECUTABLE} -source 1.5 -target 1.5
${current_list_path}/GetSystemProperty.java -d ${CMAKE_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
diff --git a/Examples/Java/CMakeLists.txt b/Examples/Java/CMakeLists.txt
index c5ad968..1f25f2d 100644
--- a/Examples/Java/CMakeLists.txt
+++ b/Examples/Java/CMakeLists.txt
@@ -20,7 +20,7 @@ set(examples
foreach(example ${examples})
add_custom_command(
OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class
- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar
+ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java
COMMENT "javac ${example}.java"
diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Java/CMakeLists.txt b/Testing/Source/DataStructureAndEncodingDefinition/Java/CMakeLists.txt
index 7a7a6ee..3d3f010 100644
--- a/Testing/Source/DataStructureAndEncodingDefinition/Java/CMakeLists.txt
+++ b/Testing/Source/DataStructureAndEncodingDefinition/Java/CMakeLists.txt
@@ -15,7 +15,7 @@ set(classfilesdep)
foreach(example ${GDCM_JAVA_TEST_SRCS})
add_custom_command(
OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class
- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -source 1.5 -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar
+ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH} -source 1.5 -target 1.5 -classpath ${LIBRARY_OUTPUT_PATH}/gdcm.jar
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java
COMMENT "javac ${example}.java"
diff --git a/Utilities/VTK/CMakeLists.txt b/Utilities/VTK/CMakeLists.txt
index dd09bef..6e5141e 100644
--- a/Utilities/VTK/CMakeLists.txt
+++ b/Utilities/VTK/CMakeLists.txt
@@ -644,7 +644,7 @@ if(GDCM_WRAP_JAVA)
#COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -cp ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
# No such thing as -cp for javac only java is listed:
# http://java.sun.com/j2se/1.5.0/docs/tooldocs/windows/classpath.html
- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${jflags} -source 1.5 -classpath ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
+ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS ${jflags} -source 1.5 -target 1.5 -classpath ${GDCM_VTK_JAVA_JAR} "vtk/*.java"
COMMAND ${Java_JAR_EXECUTABLE} ARGS -cvfm ${LIBRARY_OUTPUT_PATH}/${PROJECT_NAME}.jar ${CMAKE_CURRENT_SOURCE_DIR}/manifest.txt vtk/*.class
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java
DEPENDS ${VTKGDCM_NAME}Java
diff --git a/Utilities/VTK/Examples/Java/CMakeLists.txt b/Utilities/VTK/Examples/Java/CMakeLists.txt
index 2195804..6e714cb 100644
--- a/Utilities/VTK/Examples/Java/CMakeLists.txt
+++ b/Utilities/VTK/Examples/Java/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
foreach(example ${examples})
add_custom_command(
OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class
- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -classpath "${classpath}"
+ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 -classpath "${classpath}"
${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java
diff --git a/Utilities/VTK/Testing/Java/CMakeLists.txt b/Utilities/VTK/Testing/Java/CMakeLists.txt
index 118c44e..bd6ba94 100644
--- a/Utilities/VTK/Testing/Java/CMakeLists.txt
+++ b/Utilities/VTK/Testing/Java/CMakeLists.txt
@@ -21,7 +21,7 @@ set(classfilesdep)
foreach(example ${VTKGDCM_JAVA_TEST_SRCS})
add_custom_command(
OUTPUT ${EXECUTABLE_OUTPUT_PATH}/${example}.class
- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -classpath "${classpath}"
+ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 -classpath "${classpath}"
${CMAKE_CURRENT_SOURCE_DIR}/${example}.java -d ${EXECUTABLE_OUTPUT_PATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${example}.java
diff --git a/Wrapping/Java/CMakeLists.txt b/Wrapping/Java/CMakeLists.txt
index d3a704b..349f118 100644
--- a/Wrapping/Java/CMakeLists.txt
+++ b/Wrapping/Java/CMakeLists.txt
@@ -77,7 +77,7 @@ add_custom_command(
# please compiler such as ecj (Eclipse Java Compiler 0.894_R34x) explicitly
# state we want 1.5 version to compile gdcm::ImageToImageFilter::GetOutput()
# const as covariant return type
- COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 "gdcm/*.java" #${javafiles}
+ COMMAND ${Java_JAVAC_EXECUTABLE} ARGS -source 1.5 -target 1.5 "gdcm/*.java" #${javafiles}
# 2. now that the *.class have been generated construct the jar file. We can
# only rely on the gdcm.java / gdcm.class to build dependencie, I am pretty
# sure it will break parallel builds... oh well
