mirrors/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2026-09-25 04:09:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adjust HDF5Examples HDF5 version var to correct version check issue for 2.0 (#5926)

Browse Source 
Adjusts H5_LIBVER_DIR in CMakeLists.txt to include release version for major versions above 1, fixing #5925.
This commit is contained in:
Allen Byrne
2025-10-23 10:40:32 -05:00
committed by GitHub
parent f981c9c9be
commit 4202ae830c
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HDF5Examples/config/cmake/HDFExampleMacros.cmake
+25 -9
View File
@@ -304,13 +304,22 @@ macro (HDF5_SUPPORT)
if (H5EXAMPLE_BUILD_JAVA AND HDF5_Java_FOUND)
if (${HDF5_PROVIDES_JAVA})
set (CMAKE_JAVA_INCLUDE_PATH "${CMAKE_JAVA_INCLUDE_PATH};${HDF5_JAVA_INCLUDE_DIRS}")
get_target_property (libsoname ${HDF5_JAVA_LIBRARY} IMPORTED_SONAME${UPPER_BUILD_TYPE})
get_filename_component (libname ${libsoname} NAME_WE)
string (REGEX REPLACE "^lib" "" libname ${libname})
message (STATUS "HDF5 lib:${HDF5_JAVA_LIBRARY} OR ${libsoname} OR ${libname}")
set (H5EXAMPLE_JAVA_LIBRARY ${libname})
set (H5EXAMPLE_JAVA_LIBRARIES ${HDF5_JAVA_LIBRARY})
message (STATUS "HDF5 lib:${H5EXAMPLE_JAVA_LIBRARY} jars:${HDF5_JAVA_INCLUDE_DIRS}}")
if (HDF5_PROVIDES_JNI AND HDF5_Java_FOUND)
get_target_property (libsoname ${HDF5_JAVA_LIBRARY} IMPORTED_SONAME${UPPER_BUILD_TYPE})
get_filename_component (libname ${libsoname} NAME_WE)
string (REGEX REPLACE "^lib" "" libname ${libname})
message (STATUS "HDF5 java lib:${HDF5_JAVA_LIBRARY} OR ${libsoname} OR ${libname}")
set (H5EXAMPLE_JAVA_LIBRARY ${libname})
set (H5EXAMPLE_JAVA_LIBRARIES ${HDF5_JAVA_LIBRARY})
else ()
get_target_property (libsoname ${HDF5_C_SHARED_LIBRARY} IMPORTED_SONAME${UPPER_BUILD_TYPE})
get_filename_component (libname ${libsoname} NAME_WE)
string (REGEX REPLACE "^lib" "" libname ${libname})
message (STATUS "HDF5 java lib:${HDF5_C_SHARED_LIBRARY} OR ${libsoname} OR ${libname}")
set (H5EXAMPLE_JAVA_LIBRARY ${HDF5_C_SHARED_LIBRARY})
set (H5EXAMPLE_JAVA_LIBRARIES ${HDF5_JAVA_LIBRARY})
endif ()
message (STATUS "HDF5 java lib:${H5EXAMPLE_JAVA_LIBRARY} jars:${HDF5_JAVA_INCLUDE_DIRS}}")
else ()
set (H5EXAMPLE_BUILD_JAVA OFF CACHE BOOL "Build Java support" FORCE)
message (STATUS "HDF5 Java libs not found - disable build of Java examples")
@@ -384,8 +393,15 @@ macro (APIVersion version xyapi)
if (NOT ${rem} STREQUAL "0")
math (EXPR minor "${minor} + 1")
endif ()
set (${xyapi} "${major}${minor}")
if (major GREATER 1)
if (minor GREATER 9)
set (${xyapi} ${major}${minor})
else ()
set (${xyapi} ${major}0${minor})
endif()
else ()
set (${xyapi} ${major}${minor})
endif()
#-----------------------------------------------------------------------------
# Option to use 1.6.x API