mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-12 01:50:46 +02:00
8eeb04e205
* gnu/packages/maths.scm (hdf5): Update to 1.14.6. Do not inherit from hdf5-1.8. [name, version]: New field. [source]: Switch to git-fetch. Add modules and snippet fields. Use different patch file. [build-system]: New field. Use CMake. [inputs]: New field. [native-inputs]: New field. Add bison, flex and which. [arguments]: Do not inherit from hdf5-1.8. <#:configure-flags>: New field. <#:phases>: New field. Use gexps. Remove 'patch-configure, 'patch-settings, 'patch-references, 'split, 'skip-version-test and 'patch-configure-build-settings phases. Add 'make-gen-deterministic, 'generate-flexbison, 'patch-trace-shebang, 'fix-fortran-i686-test and 'generate-headers phases. [home-page, synopsis, description]: New fields. [license]: New field. Adjust URL. (hdf5-parallel-openmpi)[inputs]: Use modify-inputs and drop labels. [arguments]<#:configure-flags> Use flags for CMake. <#:phases>: Delete 'patch-tests phase. * gnu/packages/patches/hdf5-config-dependencies.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: If3a97fe7e252cc48a050ac396a68a87a02600916 Signed-off-by: Andreas Enge <andreas@enge.fr>
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
The installed CMake configuration is missing targets for zlib and
|
|
libaec. Taken from
|
|
https://github.com/microsoft/vcpkg/blob/e36fe7110deac47a3aff8eda3dcc7cfb894a2ebf/ports/hdf5/hdf5_config.patch
|
|
|
|
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
|
|
index 1a3fb7bbf2..79081ce040 100644
|
|
--- a/config/cmake/hdf5-config.cmake.in
|
|
+++ b/config/cmake/hdf5-config.cmake.in
|
|
@@ -120,12 +114,22 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@)
|
|
# Don't include targets if this file is being picked up by another
|
|
# project which has already built hdf5 as a subproject
|
|
#-----------------------------------------------------------------------------
|
|
+include(CMakeFindDependencyMacro)
|
|
if (NOT TARGET "@HDF5_PACKAGE@")
|
|
if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
|
|
include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
|
|
+ elseif (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT)
|
|
+ find_dependency(ZLIB)
|
|
endif ()
|
|
if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
|
|
include (@PACKAGE_SHARE_INSTALL_DIR@/@LIBAEC_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
|
|
+ elseif (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
|
|
+ if (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS)
|
|
+ set(libaec_USE_STATIC_LIBS ON)
|
|
+ else()
|
|
+ set(libaec_USE_STATIC_LIBS OFF)
|
|
+ endif()
|
|
+ find_dependency(libaec)
|
|
endif ()
|
|
include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
|
|
endif ()
|