Skip to content

Commit 195fe27

Browse files
committed
use MAC_HDF5_BASE instead of hardcoded hdf5 location
addresses #214
1 parent ca13dec commit 195fe27

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@
179179
OTHER_LDFLAGS = (
180180
"$(inherited)",
181181
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
182-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
183-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
182+
"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5.a",
183+
"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5_cpp.a",
184184
);
185185
PRODUCT_NAME = "$(TARGET_NAME)";
186186
};
@@ -197,8 +197,8 @@
197197
OTHER_LDFLAGS = (
198198
"$(inherited)",
199199
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
200-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
201-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
200+
"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5.a",
201+
"-Wl,-force_load,$(MAC_HDF5_BASE)/lib/libhdf5_cpp.a",
202202
);
203203
PRODUCT_NAME = "$(TARGET_NAME)";
204204
};

Builds/MacOSX/Plugins/Config/Base.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Defaults for values that might be overridden in Env.xcconfig
22
JULIA_PATH = /Applications/Julia-0.5.app/Contents/Resources/julia
33
MAC_PACKAGE_DIR = /opt/local
4+
MAC_HDF5_BASE = $(MAC_PACKAGE_DIR)/lib/hdf5-18
45

56
// Pull in machine-specific settings from git-ignored file, if it exists.
67
#include? "Env.xcconfig"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
// config, please be sure to provide a sensible default
55
// behavior for folks who don't create their own Env.xcconfig.
66

7-
MAC_PACKAGE_DIR = /usr/local
7+
MAC_PACKAGE_DIR = /usr/local
8+
MAC_HDF5_BASE = $(MAC_PACKAGE_DIR)/Cellar/hdf5/1.8.16_1

0 commit comments

Comments
 (0)