Add HDF5 library files for linux

open-ephys-plugins · Jul 7, 2020 · 789abb1 · 789abb1
1 parent 742c941
commit 789abb1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,6 +99,12 @@ if (APPLE) #this is needed by the unorthodox way hdf5 version 18 is installed
 	set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};/opt/local/lib/hdf5-18)
 endif()
 
+if (MSVC)
+	install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libs/windows/bin/${CMAKE_LIBRARY_ARCHITECTURE}/ DESTINATION ${GUI_BIN_DIR}/shared CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
+elseif(LINUX)
+	install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/libs/linux/bin/ DESTINATION ${GUI_BIN_DIR}/shared)
+endif()
+
 #additional libraries needed
 find_package(HDF5 1.8 EXACT COMPONENTS CXX)
 if(NOT HDF5_FOUND) #if package finding fails, try manually

diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@ A common library for all formats that write HDF5 files
 ## Installation
 ### Installing the HDF5 library
 The plugin requires a specific version of the HDF5 library (≥1.8.12 and <1.8.21)
-For windows, the required files are already included for the plugin
-We have detailed instructions on our wiki on how to install the required HDF5 version for [Linux](https://open-ephys.atlassian.net/wiki/spaces/OEW/pages/491546/Linux) and [macOS](https://open-ephys.atlassian.net/wiki/spaces/OEW/pages/491555/macOS).
+For windows and linux, the required files are already included for the plugin
+We have detailed instructions on our wiki on how to install the required HDF5 version for [macOS](https://open-ephys.atlassian.net/wiki/spaces/OEW/pages/491555/macOS).
 
 ### Building the plugins
 Building the plugins requires [CMake](https://cmake.org/). Detailed instructions on how to build open ephys plugins with CMake can be found in [our wiki](https://open-ephys.atlassian.net/wiki/spaces/OEW/pages/1259110401/Plugin+CMake+Builds).

diff --git a/libs/linux/lib/libhdf5.so.10 → libs/linux/bin/libhdf5.so.10 b/libs/linux/lib/libhdf5.so.10 → libs/linux/bin/libhdf5.so.10
diff --git a/libs/linux/lib/libhdf5_cpp.so.15 → libs/linux/bin/libhdf5_cpp.so.15 b/libs/linux/lib/libhdf5_cpp.so.15 → libs/linux/bin/libhdf5_cpp.so.15
diff --git a/libs/linux/lib/libhdf5.so b/libs/linux/lib/libhdf5.so
diff --git a/libs/linux/lib/libhdf5_cpp.so b/libs/linux/lib/libhdf5_cpp.so