Commit dc0e2727 authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Merge branch 'java_sans_testing-rel' into release

Change-Id: I9aab7796b955c3281fcd78d4b4bdcb7d5965644d
parents e626847f 26acf648
......@@ -36,13 +36,16 @@ set(VTK_JAVA_SOURCE_FILES ${VTK_JAVA_DEPENDENCIES})
string(REGEX REPLACE "\\.java" ".class;" VTK_JAVA_CLASS_FILES ${VTK_JAVA_SOURCE_FILES})
# Setup custom targets
add_custom_target(VTKJavaTestClasses ALL DEPENDS ${VTK_BINARY_DIR}/java/javac_tests_stamp.txt)
if (BUILD_TESTING)
add_custom_target(VTKJavaTestClasses ALL DEPENDS ${VTK_BINARY_DIR}/java/javac_tests_stamp.txt)
endif()
add_custom_target(VTKJavaJar ALL DEPENDS ${VTK_JAR_PATH}/vtk.jar)
add_custom_target(VTKJavaClasses ALL DEPENDS ${VTK_BINARY_DIR}/java/javac_stamp.txt)
add_dependencies(VTKJavaJar VTKJavaClasses)
add_dependencies(VTKJavaTestClasses VTKJavaJar)
if (BUILD_TESTING)
add_dependencies(VTKJavaTestClasses VTKJavaJar)
endif()
# Some platforms have libjvm in a subdirectory from
# the rest of the java libraries and are missing the symlink.
......@@ -138,8 +141,11 @@ set(VTK_JAVA_DEPENDENCIES
set(VTK_JAVA_SAMPLE_DEPENDENCIES)
if(vtkRenderingCore_ENABLED)
if (BUILD_TESTING)
set(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES}
vtkJavaTesting)
endif()
set(VTK_JAVA_DEPENDENCIES ${VTK_JAVA_DEPENDENCIES}
vtkJavaTesting
AxesActor
vtkRenderWindowPanel
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment