summaryrefslogtreecommitdiffstats
path: root/java/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-01-22 17:22:27 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-01-22 17:22:27 (GMT)
commit233afe3b6f77a487baed555569ee0524ca7a4d24 (patch)
treebd247af8868be2a861374ce3a3d670547c62548f /java/test
parenta3afda29f501e166d4d40ef1ad1fd320dbfe1974 (diff)
downloadhdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.zip
hdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.tar.gz
hdf5-233afe3b6f77a487baed555569ee0524ca7a4d24.tar.bz2
HDFFV-10385,10392,10393 merge from develop
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}