diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2022-12-24 05:24:45 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-24 05:24:45 (GMT) |
commit | e783b100d473f0e4f77147f3b89b0a73cb09126a (patch) | |
tree | cd023a8c0e5b3b2e2d27edb92cb40282f4149994 /hl/tools | |
parent | 29390b489639af14885064631bb42c216de69984 (diff) | |
download | hdf5-e783b100d473f0e4f77147f3b89b0a73cb09126a.zip hdf5-e783b100d473f0e4f77147f3b89b0a73cb09126a.tar.gz hdf5-e783b100d473f0e4f77147f3b89b0a73cb09126a.tar.bz2 |
Brings HL GIF tools configure changes from develop (#2361)
Diffstat (limited to 'hl/tools')
-rw-r--r-- | hl/tools/CMakeLists.txt | 16 | ||||
-rw-r--r-- | hl/tools/Makefile.am | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt index 7df2b79..a369d9e 100644 --- a/hl/tools/CMakeLists.txt +++ b/hl/tools/CMakeLists.txt @@ -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) diff --git a/hl/tools/Makefile.am b/hl/tools/Makefile.am index f3fe0d3..9f93f67 100644 --- a/hl/tools/Makefile.am +++ b/hl/tools/Makefile.am @@ -25,6 +25,6 @@ else endif # All subdirectories -SUBDIRS=$(TOOLS_DIR) h5watch +SUBDIRS=h5watch $(TOOLS_GIF_DIR) include $(top_srcdir)/config/conclude.am |