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/examples/groups | |
| 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/examples/groups')
| -rw-r--r-- | java/examples/groups/CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt index 7f2801a..56c92fe 100644 --- a/java/examples/groups/CMakeLists.txt +++ b/java/examples/groups/CMakeLists.txt @@ -61,13 +61,7 @@ endforeach () add_custom_target(H5Ex_G_Visit_files ALL COMMENT "Copying files needed by H5Ex_G_Visit tests" DEPENDS ${H5Ex_G_Visit_files_list}) MACRO (ADD_H5_TEST resultfile resultcode) - 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 JAVA_groups-${resultfile} COMMAND "${CMAKE_COMMAND}" |