summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-09-19 01:58:51 (GMT)
committerGitHub <noreply@github.com>2023-09-19 01:58:51 (GMT)
commitd9d99238a0a14ad8891a9d6aa3bc66c5ef7a94b5 (patch)
tree8a64ddb0ab4cd0f7f786b8c48f06949d32cf97d4 /java
parent18c5080a2c6c6dcfc9c35e46890e3f89095d2215 (diff)
downloadhdf5-d9d99238a0a14ad8891a9d6aa3bc66c5ef7a94b5.zip
hdf5-d9d99238a0a14ad8891a9d6aa3bc66c5ef7a94b5.tar.gz
hdf5-d9d99238a0a14ad8891a9d6aa3bc66c5ef7a94b5.tar.bz2
Sync CMake and doxygen changes with develop (#3543)
* Sync CMake and doxygen changes from develop * Add missing images
Diffstat (limited to 'java')
-rw-r--r--java/examples/datasets/CMakeLists.txt2
-rw-r--r--java/test/TestH5.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index 6ed03ca..7542e8e 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -80,7 +80,7 @@ endforeach ()
if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
- set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<CONFIG:Debug>:${CMAKE_DEBUG_POSTFIX}>;")
+ set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
set (last_test "")
foreach (example ${HDF_JAVA_EXAMPLES})
diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index 016c471..c5d945f 100644
--- a/java/test/TestH5.java
+++ b/java/test/TestH5.java
@@ -309,7 +309,7 @@ public class TestH5 {
@Test
public void testH5get_libversion()
{
- int libversion[] = {1, 10, 9};
+ int libversion[] = {1, 10, 11};
try {
H5.H5get_libversion(libversion);