diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-03-20 22:41:53 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-20 22:41:53 (GMT) |
commit | f1e7081cc28b3af0077af71605df7320aa1b9312 (patch) | |
tree | 1873fb4c23c1d55462db723d30736cf65f2eb108 /hl/tools | |
parent | 69f3562e312356fe5c58bcc94f0faecdf4af32cf (diff) | |
download | hdf5-f1e7081cc28b3af0077af71605df7320aa1b9312.zip hdf5-f1e7081cc28b3af0077af71605df7320aa1b9312.tar.gz hdf5-f1e7081cc28b3af0077af71605df7320aa1b9312.tar.bz2 |
Add Option to not build gif tools and remove javadoc option (#2611)
* Add Option to not build gif tools and remove javadoc option
* Remove old option
* Fix CMake command format
Diffstat (limited to 'hl/tools')
-rw-r--r-- | hl/tools/CMakeLists.txt | 8 | ||||
-rw-r--r-- | hl/tools/Makefile.am | 8 | ||||
-rw-r--r-- | hl/tools/h5watch/CMakeTests.cmake | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/hl/tools/CMakeLists.txt b/hl/tools/CMakeLists.txt index fd9b6d9..a0bd744 100644 --- a/hl/tools/CMakeLists.txt +++ b/hl/tools/CMakeLists.txt @@ -1,6 +1,12 @@ cmake_minimum_required (VERSION 3.12) project (HDF5_HL_TOOLS C) -add_subdirectory (gif2h5) +#----------------------------------------------------------------------------- +#-- 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 6687f40..9f93f67 100644 --- a/hl/tools/Makefile.am +++ b/hl/tools/Makefile.am @@ -18,7 +18,13 @@ include $(top_srcdir)/config/commence.am +if BUILD_TOOLS_HL_GIF_CONDITIONAL + TOOLS_GIF_DIR = gif2h5 +else + TOOLS_GIF_DIR = +endif + # All subdirectories -SUBDIRS=gif2h5 h5watch +SUBDIRS=h5watch $(TOOLS_GIF_DIR) include $(top_srcdir)/config/conclude.am diff --git a/hl/tools/h5watch/CMakeTests.cmake b/hl/tools/h5watch/CMakeTests.cmake index 32b2b95..fe0d52a 100644 --- a/hl/tools/h5watch/CMakeTests.cmake +++ b/hl/tools/h5watch/CMakeTests.cmake @@ -189,7 +189,7 @@ set (last_test "H5WATCH-clearall-objects") add_test (NAME H5WATCH-h5watchgentest COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5watchgentest>) set_tests_properties (H5WATCH-h5watchgentest PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles" - DEPENDS "H5WATCH-clearall-objects" + DEPENDS H5WATCH-clearall-objects ) set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_SETUP gen_test_watch) set_tests_properties (H5WATCH-h5watchgentest PROPERTIES FIXTURES_REQUIRED swmr_vfd_check_compat) |