summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
Diffstat (limited to 'hl')
-rw-r--r--hl/CMakeLists.txt10
-rw-r--r--hl/Makefile.am4
-rw-r--r--hl/tools/CMakeLists.txt16
-rw-r--r--hl/tools/Makefile.am2
4 files changed, 9 insertions, 23 deletions
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt
index 6c5ad70..a777b72 100644
--- a/hl/CMakeLists.txt
+++ b/hl/CMakeLists.txt
@@ -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
diff --git a/hl/Makefile.am b/hl/Makefile.am
index 3cf8778..5660b9b 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -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
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