From 2f7e737ff4b0ca37e51ce3a5c7ab6e8810c5d1fc Mon Sep 17 00:00:00 2001 From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> Date: Wed, 16 Dec 2020 15:47:56 -0600 Subject: HDF5 1 12 - OESS-98 fix hdf5 link target (#189) * 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 * OESS-98 fix tools test for plugins * Fix conflict * OESS-98 fix hdf5 link target --- config/cmake/HDF5PluginCache.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/cmake/HDF5PluginCache.cmake b/config/cmake/HDF5PluginCache.cmake index acf703d..99ea4b2 100644 --- a/config/cmake/HDF5PluginCache.cmake +++ b/config/cmake/HDF5PluginCache.cmake @@ -10,8 +10,7 @@ set (BUILD_EXAMPLES ON CACHE BOOL "Build h5pl Examples" FORCE) set (HDF5_PACKAGE_NAME "hdf5" CACHE STRING "Name of HDF5 package" FORCE) set (HDF5_HDF5_HEADER "h5pubconf.h" CACHE STRING "Name of HDF5 header" FORCE) -set (HDF5_LINK_TARGET ${HDF5_LIBSH_TARGET} CACHE STRING "hdf5 target" FORCE) -set (HDF5_LINK_LIBS $ CACHE STRING "hdf5 shared link library" FORCE) +set (HDF5_LINK_LIBS ${HDF5_LIBSH_TARGET} CACHE STRING "hdf5 target" FORCE) #set (HDF5_INCLUDE_DIR $ CACHE PATH "hdf5 include dirs" FORCE) set (HDF5_INCLUDE_DIR "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR}" CACHE PATH "hdf5 include dirs" FORCE) set (HDF5_INCLUDE_DIRS "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR}" CACHE PATH "hdf5 include dirs" FORCE) -- cgit v0.12