Merge pull request #215 from beOn/mac_hdf5_fix

Mac hdf5 fix

Author: jsiegle

Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj

@@ -179,8 +179,8 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
-					"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
-					"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
+					"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5.a",
+					"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5_cpp.a",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -197,8 +197,8 @@
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
-					"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
-					"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
+					"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5.a",
+					"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5_cpp.a",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

Builds/MacOSX/Plugins/Config/Base.xcconfig

@@ -1,6 +1,7 @@
 // Defaults for values that might be overridden in Env.xcconfig
 JULIA_PATH = /Applications/Julia-0.5.app/Contents/Resources/julia
 MAC_PACKAGE_DIR = /opt/local
+MAC_HDF5_BASE = $(MAC_PACKAGE_DIR)/lib/hdf5-18
 
 // Pull in machine-specific settings from git-ignored file, if it exists.
 #include? "Env.xcconfig"

Builds/MacOSX/Plugins/Config/Env.xcconfig.example

@@ -4,4 +4,5 @@
 // config, please be sure to provide a sensible default
 // behavior for folks who don't create their own Env.xcconfig.
 
-MAC_PACKAGE_DIR = /usr/local
+MAC_PACKAGE_DIR = /usr/local
+MAC_HDF5_BASE = $(MAC_PACKAGE_DIR)/Cellar/hdf5/1.8.16_1

Builds/MacOSX/Plugins/Config/Plugin.xcconfig

@@ -1,10 +1,3 @@
-// Defaults for values that might be overridden in Env.xcconfig
-JULIA_PATH = /Applications/Julia-0.5.app/Contents/Resources/julia
-MAC_PACKAGE_DIR = /opt/local
-
-// Pull in machine-specific settings from git-ignored file, if it exists.
-#include "Env.xcconfig"
-
 #include "Base.xcconfig"
 
 CONFIGURATION_BUILD_DIR = $(PROJECT_DIR)/../../build/$(CONFIGURATION)/open-ephys.app/Contents/PlugIns