philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests 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
7 changed files with 32 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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