From 44b97e373ae44b28302784475c6a9895b8736d2d Mon Sep 17 00:00:00 2001
From: Aaron Cuevas Lopez <aacuelo@teleco.upv.es>
Date: Tue, 30 May 2017 04:58:01 +0200
Subject: [PATCH] Fix building issues on OSX
---
.../contents.xcworkspacedata | 3 ---
.../OpenEphysHDF5.xcodeproj/project.pbxproj | 2 ++
Builds/MacOSX/Plugins/Config/Plugin.xcconfig | 2 ++
.../KWIKFormat.xcodeproj/project.pbxproj | 18 ++++++++++++++++++
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata b/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata
index 5d8052eab..0a9ef155f 100644
--- a/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata
+++ b/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata
@@ -35,9 +35,6 @@
<FileRef
location = "group:FilterNode/FilterNode.xcodeproj">
</FileRef>
- <FileRef
- location = "group:JuliaProcessor/JuliaProcessor.xcodeproj">
- </FileRef>
<FileRef
location = "group:KWIKFormat/KWIKFormat.xcodeproj">
</FileRef>
diff --git a/Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj b/Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj
index c9f7a5955..0b89c3ba4 100644
--- a/Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj
+++ b/Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj
@@ -174,6 +174,7 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(MAC_PACKAGE_DIR)/include",
+ "$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
);
OTHER_LDFLAGS = (
"$(inherited)",
@@ -191,6 +192,7 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(MAC_PACKAGE_DIR)/include",
+ "$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
);
OTHER_LDFLAGS = (
"$(inherited)",
diff --git a/Builds/MacOSX/Plugins/Config/Plugin.xcconfig b/Builds/MacOSX/Plugins/Config/Plugin.xcconfig
index a89db7a4d..462d06726 100644
--- a/Builds/MacOSX/Plugins/Config/Plugin.xcconfig
+++ b/Builds/MacOSX/Plugins/Config/Plugin.xcconfig
@@ -5,6 +5,8 @@ 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
COPY_PHASE_STRIP = NO
DEBUG_INFORMATION_FORMAT = dwarf
diff --git a/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj b/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj
index 85bdb247c..3a834b983 100644
--- a/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj
+++ b/Builds/MacOSX/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj
@@ -197,6 +197,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E1F558DB1C9B23830035F88B /* Plugin_Debug.xcconfig */;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ ../../../../JuceLibraryCode,
+ ../../../../JuceLibraryCode/modules,
+ ../../../../Source/Plugins/Headers,
+ ../../../../Source/Plugins/CommonLibs,
+ "$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
+ "$(MAC_PACKAGE_DIR)/include",
+ "$(inherited)",
+ );
};
name = Debug;
};
@@ -204,6 +213,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = E1F558DC1C9B23830035F88B /* Plugin_Release.xcconfig */;
buildSettings = {
+ HEADER_SEARCH_PATHS = (
+ ../../../../JuceLibraryCode,
+ ../../../../JuceLibraryCode/modules,
+ ../../../../Source/Plugins/Headers,
+ ../../../../Source/Plugins/CommonLibs,
+ "$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
+ "$(MAC_PACKAGE_DIR)/include",
+ "$(inherited)",
+ );
};
name = Release;
};
--
GitLab