summaryrefslogtreecommitdiffstats
path: root/java/test
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2018-02-01 16:06:06 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2018-02-01 16:06:06 (GMT)
commit66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0 (patch)
tree509ec74601358f6715dd2e18f4f9e8aef22e71c5 /java/test
parent4c0440e61f5bc57f12406b523e9545980e9e6b70 (diff)
parentb86cc6ea841c24a0513c95b8e6d9aaac209c0fb8 (diff)
downloadhdf5-66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0.zip
hdf5-66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0.tar.gz
hdf5-66e5f283c554f6ae84fbfafc6a8476a35dfcf3d0.tar.bz2
Merge branch 'bugfix/version_bounds' of https://bitbucket.hdfgroup.org/scm/~bmribler/version_bounds_bmr into bugfix/version_bounds
Diffstat (limited to 'java/test')
-rw-r--r--java/test/CMakeLists.txt9
1 files changed, 1 insertions, 8 deletions
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index fadc1ea..49cda32 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -88,14 +88,7 @@ endforeach ()
set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${HDF5_JAVA_TEST_LIB_TARGET}_JAR_FILE}")
set (testfilter "OK (598 tests)")
-if (HDF5_BUILD_TYPE MATCHES Debug)
- if (WIN32)
- set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_D;")
- else ()
- set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=hdf5_java_debug;")
- endif ()
-endif ()
-
+ set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<TARGET_PROPERTY:${HDF5_JAVA_JNI_LIB_TARGET},OUTPUT_NAME$<$<CONFIG:Debug>:_DEBUG>>;")
add_test (
NAME JUnit-interface-clearall-objects
COMMAND ${CMAKE_COMMAND}