diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2020-12-15 00:15:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 00:15:39 (GMT) |
| commit | d673ee0cdd826100f6c914ea0851d742699ed740 (patch) | |
| tree | d0ff5f967748b525275c3f37526d33aab87c702c /CMakeLists.txt | |
| parent | 629fcdb3d05edeab2f72838e595b5cae1c858c97 (diff) | |
| download | hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.zip hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.tar.gz hdf5-d673ee0cdd826100f6c914ea0851d742699ed740.tar.bz2 | |
OESS-98 Update plugin build option - HDF5 1 12 (#173)
* merge updates from develop
* remove extension on command
* Run autogen before chkmanifest
* Update release text files and whitespace cleanup
* Update list
* OESS-98 Update plugin build option
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 56e97d2..afa034e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -844,17 +844,6 @@ endif () #----------------------------------------------------------------------------- add_subdirectory (src) -#----------------------------------------------------------------------------- -# Include filter plugins -#----------------------------------------------------------------------------- -include (CMakePlugins.cmake) - -if (HDF5_PACKAGE_EXTLIBS AND NOT HDF5_NO_PACKAGES) - if (HDF5_ENABLE_PLUGIN_SUPPORT AND PLUGIN_FOUND) - PACKAGE_PLUGIN_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) - endif () -endif () - if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL) if (NOT ONLY_SHARED_LIBS) @@ -872,11 +861,6 @@ if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MAT add_dependencies (${HDF5_LIBSH_TARGET} SZIP) endif () endif () - if (PLUGIN_FOUND AND PLUGIN_USE_EXTERNAL) - if (BUILD_SHARED_LIBS) - add_dependencies (PLUGIN ${HDF5_LIBSH_TARGET}) - endif () - endif () endif () #----------------------------------------------------------------------------- @@ -954,6 +938,21 @@ if (BUILD_TESTING) endif () #----------------------------------------------------------------------------- +# Include filter plugins +#----------------------------------------------------------------------------- +include (CMakePlugins.cmake) + +if (HDF5_PACKAGE_EXTLIBS AND NOT HDF5_NO_PACKAGES) + if (HDF5_ENABLE_PLUGIN_SUPPORT AND PLUGIN_FOUND) + PACKAGE_PLUGIN_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) +# option (HDF5_TEST_PLUGIN "Execute plugin tests" ON) +# mark_as_advanced (HDF5_TEST_PLUGIN) + +# TEST_PLUGIN_LIBRARY () + endif () +endif () + +#----------------------------------------------------------------------------- # Option to build HDF5 Utilities #----------------------------------------------------------------------------- if (EXISTS "${HDF5_SOURCE_DIR}/utils" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/utils") |