diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-25 15:59:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-25 15:59:32 (GMT) |
| commit | b692e9fdceebe03f05dffa2e4a5f9e1b4d2672d9 (patch) | |
| tree | bd247af8868be2a861374ce3a3d670547c62548f /java/examples/groups | |
| parent | a3afda29f501e166d4d40ef1ad1fd320dbfe1974 (diff) | |
| parent | 233afe3b6f77a487baed555569ee0524ca7a4d24 (diff) | |
| download | hdf5-b692e9fdceebe03f05dffa2e4a5f9e1b4d2672d9.zip hdf5-b692e9fdceebe03f05dffa2e4a5f9e1b4d2672d9.tar.gz hdf5-b692e9fdceebe03f05dffa2e4a5f9e1b4d2672d9.tar.bz2 | |
Merge pull request #865 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '233afe3b6f77a487baed555569ee0524ca7a4d24':
HDFFV-10385,10392,10393 merge from develop
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}" |