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

Check if namespace has been defined before creating alias (#5590)

Browse Source
This commit is contained in:
Allen Byrne
2025-06-12 12:10:55 -05:00
committed by GitHub
parent 869910e03b
commit 0d795cc00e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/cmake/HDFLibMacros.cmake
+7 -3
View File
@@ -43,7 +43,9 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
FetchContent_MakeAvailable(HDF5_ZLIB)
add_library(${HDF_PACKAGE_NAMESPACE}zlib-static ALIAS zlib-static)
if (HDF_PACKAGE_NAMESPACE)
add_library(${HDF_PACKAGE_NAMESPACE}zlib-static ALIAS zlib-static)
endif ()
set (H5_ZLIB_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-static")
set (H5_ZLIB_LIBRARIES ${H5_ZLIB_STATIC_LIBRARY})
if (HDF5_USE_ZLIB_NG)
@@ -85,8 +87,10 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
endif ()
FetchContent_MakeAvailable(SZIP)
add_library (${HDF_PACKAGE_NAMESPACE}szaec-static ALIAS szaec-static)
add_library (${HDF_PACKAGE_NAMESPACE}aec-static ALIAS aec-static)
if (HDF_PACKAGE_NAMESPACE)
add_library (${HDF_PACKAGE_NAMESPACE}szaec-static ALIAS szaec-static)
add_library (${HDF_PACKAGE_NAMESPACE}aec-static ALIAS aec-static)
endif ()
set (H5_SZIP_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}szaec-static;${HDF_PACKAGE_NAMESPACE}aec-static")
set (H5_SZIP_LIBRARIES ${H5_SZIP_STATIC_LIBRARY})
config/examples/HDF5AsSubdirMacros.cmake
+3 -1
View File
@@ -60,7 +60,9 @@ macro (EXTERNAL_HDF5_LIBRARY compress_type)
add_subdirectory(${hdf5lib_SOURCE_DIR} ${hdf5lib_BINARY_DIR})
endif()
add_library(${HDF_PACKAGE_NAMESPACE}hdf5lib-static ALIAS hdf5-static)
if (HDF_PACKAGE_NAMESPACE)
add_library(${HDF_PACKAGE_NAMESPACE}hdf5lib-static ALIAS hdf5-static)
endif()
set (H5LIB_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}hdf5lib-static")
set (H5LIB_LIBRARIES ${H5LIB_STATIC_LIBRARY})
set (H5LIB_TOOLS ${hdf5lib_BINARY_DIR}/bin})