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

HL GIF tools changes (#2360)

Browse Source 
* Fixes the broken Autotools option
* Removes the "build HL tools" option
This commit is contained in:
Dana Robinson 2022-12-23 16:05:31 -08:00 committed by GitHub
parent 9a694db450
commit cfd5059e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/cmake/libhdf5.settings.cmake.in
View File

@ -72,7 +72,7 @@ Features:
Dimension scales w/ new references: @DIMENSION_SCALES_WITH_NEW_REF@
Build HDF5 Tests: @BUILD_TESTING@
Build HDF5 Tools: @HDF5_BUILD_TOOLS@
Build High-level HDF5 Tools: @HDF5_BUILD_HL_TOOLS@
Build GIF Tools: @HDF5_BUILD_HL_GIF_TOOLS@
Threadsafety: @HDF5_ENABLE_THREADSAFE@
Default API mapping: @DEFAULT_API_VERSION@
With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@

53
configure.ac
View File

@ -874,37 +874,6 @@ else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([if the high-level tools are enabled])
AC_ARG_ENABLE([hltools],
[AS_HELP_STRING([--enable-hltools],
[Enable the high-level tools.
[default=yes]
])],
[HDF5_HL_TOOLS=$enableval])
if test "X${HDF5_HL}" = "Xyes" -a "X-$HDF5_HL_TOOLS" = "X-yes"; then
AC_MSG_RESULT([yes])
HL_TOOLS="tools"
else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([if the high-level GIF tools are enabled])
AC_ARG_ENABLE([hltools],
[AS_HELP_STRING([--enable-hlgiftools],
[Enable the high-level GIF tools.
[default=no]
])],
[HDF5_HL_GIF_TOOLS=$enableval])
if test "X${HDF5_GIF_HL}" = "Xyes" -a "X-$HDF5_HL_TOOLS" = "X-yes" -a "X-$HDF5_HL_GIF_TOOLS" = "X-yes"; then
AC_MSG_RESULT([yes])
HL_GIF_TOOLS="tools"
else
AC_MSG_RESULT([no])
fi
## ----------------------------------------------------------------------
## Enable new references for dimension scales
##
@ -1195,6 +1164,27 @@ AC_ARG_ENABLE([tools],
AC_MSG_RESULT([$HDF5_TOOLS])
## ----------------------------------------------------------------------
## Check if they would like to disable building the high-level GIF
## tools (they have unfixed CVE issues)
##
AC_MSG_CHECKING([if the high-level GIF tools are enabled])
AC_ARG_ENABLE([hlgiftools],
[AS_HELP_STRING([--enable-hlgiftools],
[Enable the high-level GIF tools. NOTE: These have unfixed CVE issues!
[default=no]
])],
[HDF5_HL_GIF_TOOLS=$enableval])
if test "X-$HDF5_TOOLS" = "X-yes" -a "X-$HDF5_HL" = "X-yes" -a "X-$HDF5_HL_GIF_TOOLS" = "X-yes"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
HDF5_HL_GIF_TOOLS="no"
fi
## ----------------------------------------------------------------------
## Check if they would like to enable building doxygen files
##
@ -3927,7 +3917,6 @@ AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"])
AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"])
AM_CONDITIONAL([BUILD_TESTS_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"])
AM_CONDITIONAL([BUILD_TOOLS_CONDITIONAL], [test "X$HDF5_TOOLS" = "Xyes"])
AM_CONDITIONAL([BUILD_TOOLS_HL_CONDITIONAL], [test "X$HDF5_HL_TOOLS" = "Xyes"])
AM_CONDITIONAL([BUILD_TOOLS_HL_GIF_CONDITIONAL], [test "X$HDF5_HL_GIF_TOOLS" = "Xyes"])
AM_CONDITIONAL([BUILD_DOXYGEN_CONDITIONAL], [test "X$HDF5_DOXYGEN" = "Xyes"])

10
hl/CMakeLists.txt
View File

@ -17,15 +17,7 @@ add_subdirectory (src)
# Build HDF5 Tools
if (HDF5_BUILD_TOOLS)
#-----------------------------------------------------------------------------
#-- Option to build the High level Tools
#-----------------------------------------------------------------------------
if (EXISTS "${HDF5_HL_SOURCE_DIR}/tools" AND IS_DIRECTORY "${HDF5_HL_SOURCE_DIR}/tools")
option (HDF5_BUILD_HL_TOOLS "Build HDF5 HL Tools" ON)
if (HDF5_BUILD_HL_TOOLS)
add_subdirectory (tools)
endif ()
endif ()
add_subdirectory (tools)
endif ()
#-- Add High Level Examples

4
hl/Makefile.am
View File

@ -36,14 +36,10 @@ else
TEST_DIR =
endif
if BUILD_TOOLS_CONDITIONAL
if BUILD_TOOLS_HL_CONDITIONAL
TOOLS_DIR = tools
else
TOOLS_DIR =
endif
else
TOOLS_DIR =
endif
## Don't recurse into any subdirectories if HDF5 is not configured to
## use the HL library

16
hl/tools/CMakeLists.txt
View File

@ -1,14 +1,12 @@
cmake_minimum_required (VERSION 3.18)
project (HDF5_HL_TOOLS C)
#-----------------------------------------------------------------------------
#-- Option to build the High level GIF Tools
#-----------------------------------------------------------------------------
if (EXISTS "${HDF5_HL_SOURCE_DIR}/gif2h5" AND IS_DIRECTORY "${HDF5_HL_SOURCE_DIR}/gif2h5")
option (HDF5_BUILD_HL_GIF_TOOLS "Build HDF5 HL GIF Tools" OFF)
if (HDF5_BUILD_HL_GIF_TOOLS)
add_subdirectory (gif2h5)
endif ()
endif ()
#-----------------------------------------------------------------------------
#-- Option to build the High level GIF Tools
#-----------------------------------------------------------------------------
option (HDF5_BUILD_HL_GIF_TOOLS "Build HDF5 HL GIF Tools" OFF)
if (HDF5_BUILD_HL_GIF_TOOLS)
add_subdirectory (gif2h5)
endif ()
add_subdirectory (h5watch)

2
hl/tools/Makefile.am
View File

@ -25,6 +25,6 @@ else
endif
# All subdirectories
SUBDIRS=$(TOOLS_DIR) h5watch
SUBDIRS=h5watch $(TOOLS_GIF_DIR)
include $(top_srcdir)/config/conclude.am

1
src/libhdf5.settings.in
View File

@ -75,6 +75,7 @@ Features:
Dimension scales w/ new references: @DIMENSION_SCALES_WITH_NEW_REF@
Build HDF5 Tests: @HDF5_TESTS@
Build HDF5 Tools: @HDF5_TOOLS@
Build GIF Tools: @HDF5_HL_GIF_TOOLS@
Threadsafety: @THREADSAFE@
Default API mapping: @DEFAULT_API_VERSION@
With deprecated public symbols: @DEPRECATED_SYMBOLS@