diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-23 22:00:31 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-23 22:00:31 (GMT) |
| commit | be77e5935356f13daef03af1562476b516131c18 (patch) | |
| tree | 40103d28749e572a7f84bbb0a72ba27d51c9e3b6 /java/test | |
| parent | 8427eefafe7af83dbc133975c3ac2368cf1b08d6 (diff) | |
| parent | c5e311897444abe43b9dafcf0225e9fb880a3e2b (diff) | |
| download | hdf5-be77e5935356f13daef03af1562476b516131c18.zip hdf5-be77e5935356f13daef03af1562476b516131c18.tar.gz hdf5-be77e5935356f13daef03af1562476b516131c18.tar.bz2 | |
Merge branch 'develop' into bugfix/version_bounds
Keep the branch up-to-date.
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/CMakeLists.txt | 9 |
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} |