diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-03-01 20:19:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 20:19:43 (GMT) |
| commit | ebf89bb231cd5b41180e58facae485f819cc3cea (patch) | |
| tree | c5ef2818893b7585a9d60ad409cdda0c3685cff4 | |
| parent | c72904c6b3ff04a48209c8e26dcce3007e2ddb40 (diff) | |
| download | hdf5-ebf89bb231cd5b41180e58facae485f819cc3cea.zip hdf5-ebf89bb231cd5b41180e58facae485f819cc3cea.tar.gz hdf5-ebf89bb231cd5b41180e58facae485f819cc3cea.tar.bz2 | |
Fix install config and java test name conflict (#1467)
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 2 | ||||
| -rw-r--r-- | java/test/TestH5OcopyOld.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 09492e7..0f9b367 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -356,7 +356,7 @@ macro (HDF_DIR_PATHS package_prefix) endif () endif () if (NOT ${package_prefix}_INSTALL_CMAKE_DIR) - set (${package_prefix}_INSTALL_CMAKE_DIR share/cmake) + set (${package_prefix}_INSTALL_CMAKE_DIR cmake) endif () # Always use full RPATH, i.e. don't skip the full RPATH for the build tree diff --git a/java/test/TestH5OcopyOld.java b/java/test/TestH5OcopyOld.java index b360cd0..e547051 100644 --- a/java/test/TestH5OcopyOld.java +++ b/java/test/TestH5OcopyOld.java @@ -32,7 +32,7 @@ import org.junit.rules.TestName; public class TestH5OcopyOld { @Rule public TestName testname = new TestName(); - private static final String FILENAME = "testRefsattribute.h5"; + private static final String FILENAME = "testRefsattributeO.h5"; private static final int DIM_X = 4; private static final int DIM_Y = 6; long H5fid = HDF5Constants.H5I_INVALID_HID; @@ -140,7 +140,6 @@ public class TestH5OcopyOld { byte[] dset_data = new byte[16]; long attribute_id = HDF5Constants.H5I_INVALID_HID; - try { rbuf0 = H5.H5Rcreate(H5fid, "/G1", HDF5Constants.H5R_OBJECT, -1); rbuf1 = H5.H5Rcreate(H5fid, "DS2", HDF5Constants.H5R_OBJECT, -1); |