diff options
| -rw-r--r-- | tools/CMakeLists.txt | 45 | ||||
| -rw-r--r-- | tools/Makefile.am | 3 |
2 files changed, 11 insertions, 37 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 0b6faa8..4b9b765 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -6,11 +6,6 @@ PROJECT (HDF5_TOOLS) #----------------------------------------------------------------------------- add_definitions (${HDF_EXTRA_C_FLAGS}) -#----------------------------------------------------------------------------- -# Setup include Directories -#----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib) - # -------------------------------------------------------------------- # If testing was NOT enabled, then we need to build the tools library # -------------------------------------------------------------------- @@ -18,35 +13,15 @@ if (NOT BUILD_TESTING) add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/lib) endif (NOT BUILD_TESTING) -#-- Add the h5diff and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5diff) - -#-- Add the h5ls executable -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5ls) - -#-- Misc Executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/misc) - -#-- Add the h5import and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5import) - -#-- h5Repack executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5repack) - -#-- Add the h5dump and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5jam) - -#-- Add the h5copy and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5copy) - -#-- Add the h5stat and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5stat) - -#-- Add the h5dump and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5dump) +#----------------------------------------------------------------------------- +# Setup include Directories +#----------------------------------------------------------------------------- +INCLUDE_DIRECTORIES (${HDF5_TOOLS_SOURCE_DIR}/lib) -#-- Add the h5dump and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5format_convert) +#-- Add the test sources +add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/src) -#-- Add the perform and test executables -add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/perform) +#-- Add the tests +if (BUILD_TESTING) + add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/test) +endif (BUILD_TESTING) diff --git a/tools/Makefile.am b/tools/Makefile.am index 887c0f0..cd97069 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,6 @@ include $(top_srcdir)/config/commence.am CONFIG=ordered # All subdirectories -SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \ - h5format_convert perform +SUBDIRS=lib src test include $(top_srcdir)/config/conclude.am |