mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix install config and java test name conflict (#1467)

Browse Source
This commit is contained in:
Allen Byrne 2022-03-01 14:19:43 -06:00 committed by GitHub
parent c72904c6b3
commit ebf89bb231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/cmake_ext_mod/HDFMacros.cmake
View File

@ -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

3
java/test/TestH5OcopyOld.java
View File

@ -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);