diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-16 17:15:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 17:15:25 (GMT) |
| commit | c0f2bc87aca0ddfed4bbf1a75dda5ea71b6617eb (patch) | |
| tree | 9db02def5d5567804d3c8f8bf615ed07f3b6d3ba /hl | |
| parent | daeb4454f6d8b72d5fab6a78546859b2182bd248 (diff) | |
| download | hdf5-c0f2bc87aca0ddfed4bbf1a75dda5ea71b6617eb.zip hdf5-c0f2bc87aca0ddfed4bbf1a75dda5ea71b6617eb.tar.gz hdf5-c0f2bc87aca0ddfed4bbf1a75dda5ea71b6617eb.tar.bz2 | |
HDFFV-11266 - add option to build HL tools (#1018)
* HDFFV-11266 - add option to build HL tools
* Correct if syntax
* Correct name of conditional
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | hl/Makefile.am | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/hl/CMakeLists.txt b/hl/CMakeLists.txt index 083c60e..5061c6c 100644 --- a/hl/CMakeLists.txt +++ b/hl/CMakeLists.txt @@ -7,9 +7,17 @@ project (HDF5_HL C) add_subdirectory (src) -#-- Build the High level Tools +# Build HDF5 Tools if (HDF5_BUILD_TOOLS) - add_subdirectory (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 () endif () #-- Add High Level Examples diff --git a/hl/Makefile.am b/hl/Makefile.am index 9bf209e..8c427d3 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -37,16 +37,19 @@ 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 if BUILD_HDF5_HL_CONDITIONAL SUBDIRS=src $(TEST_DIR) $(TOOLS_DIR) $(CXX_DIR) $(FORTRAN_DIR) - endif DIST_SUBDIRS=src test tools c++ fortran examples |