summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2023-10-19 22:26:13 (GMT)
committerGitHub <noreply@github.com>2023-10-19 22:26:13 (GMT)
commitce864f6040c65df7909931c06ac72c18a8ce9ff7 (patch)
tree2c2b2f79209b5871cf8b5280ac64ac4c1e21e7b9 /config
parent1a898e792ee629afa20962a136dbb239f9c8e774 (diff)
downloadhdf5-ce864f6040c65df7909931c06ac72c18a8ce9ff7.zip
hdf5-ce864f6040c65df7909931c06ac72c18a8ce9ff7.tar.gz
hdf5-ce864f6040c65df7909931c06ac72c18a8ce9ff7.tar.bz2
Some corrections and fix for plugins (#3713)
Diffstat (limited to 'config')
-rw-r--r--config/cmake/HDF5PluginCache.cmake2
-rw-r--r--config/cmake/HDF5PluginMacros.cmake50
2 files changed, 1 insertions, 51 deletions
diff --git a/config/cmake/HDF5PluginCache.cmake b/config/cmake/HDF5PluginCache.cmake
index 34a97d5..1407561 100644
--- a/config/cmake/HDF5PluginCache.cmake
+++ b/config/cmake/HDF5PluginCache.cmake
@@ -6,7 +6,7 @@
# examples are the tests for plugins
set (H5PL_BUILD_TESTING ON CACHE BOOL "Enable H5PL testing" FORCE)
-set (BUILD_EXAMPLES ON CACHE BOOL "Build H5PL Examples" FORCE)
+set (BUILD_EXAMPLES ${HDF5_BUILD_EXAMPLES} CACHE BOOL "Build H5PL Examples" FORCE)
#preset HDF5 cache vars to this projects libraries instead of searching
set (H5PL_HDF5_HEADER "H5pubconf.h" CACHE STRING "Name of HDF5 header" FORCE)
diff --git a/config/cmake/HDF5PluginMacros.cmake b/config/cmake/HDF5PluginMacros.cmake
index 41f746f..e2bdce3 100644
--- a/config/cmake/HDF5PluginMacros.cmake
+++ b/config/cmake/HDF5PluginMacros.cmake
@@ -31,56 +31,6 @@ macro (EXTERNAL_PLUGIN_LIBRARY compress_type)
include (${HDF_RESOURCES_DIR}/HDF5PluginCache.cmake)
set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
add_subdirectory(${plugin_SOURCE_DIR} ${plugin_BINARY_DIR})
- if (ENABLE_BLOSC)
- add_dependencies (h5blosc ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_blosc ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_blosc PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_BSHUF)
- add_dependencies (h5bshuf ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_bshuf ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_bshuf PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_BZIP2)
- add_dependencies (h5bz2 ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_bzip2 ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_bzip2 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_JPEG)
- add_dependencies (h5jpeg ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_jpeg ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_jpeg PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_LZ4)
- add_dependencies (h5lz4 ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_lz4 ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_lz4 PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_LZF)
- add_dependencies (h5lzf ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_lzf ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_lzf PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_MAFISC)
- add_dependencies (h5mafisc ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_mafisc ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_mafisc PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_SZ)
- add_dependencies (h5sz ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_sz ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_sz PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_ZFP)
- add_dependencies (h5zfp ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_zfp ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_zfp PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
- if (ENABLE_ZSTD)
- add_dependencies (h5zstd ${HDF5_LIBSH_TARGET})
- add_dependencies (h5ex_d_zstd ${HDF5_LIBSH_TARGET})
- target_include_directories (h5ex_d_zstd PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}")
- endif ()
endif ()
message (VERBOSE "HDF5_INCLUDE_DIR=${HDF5_INCLUDE_DIR}")
set (PLUGIN_BINARY_DIR "${plugin_BINARY_DIR}")