Skip to content

Add preliminary support for yosemite #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leonardt wants to merge 3 commits into from
Closed

Add preliminary support for yosemite #1237

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbc4655
Add support for building on yosemite
leonardt Oct 7, 2014
48ddc95
Merge remote-tracking branch 'upstream/dev' into yosemite-build
leonardt Dec 18, 2014
ca5c600
Update new BLAS_INCLUDE for Xcode 6, not just Yosemite
leonardt Dec 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,10 @@ ifeq ($(OSX), 1)
CXXFLAGS += -stdlib=libstdc++
LINKFLAGS += -stdlib=libstdc++
endif
ifneq ($(findstring 10.10, $(shell sw_vers -productVersion)),)
CXXFLAGS += -stdlib=libstdc++
LINKFLAGS += -stdlib=libstdc++
endif
# boost::thread is called boost_thread-mt to mark multithreading on OS X
LIBRARIES += boost_thread-mt
NVCCFLAGS += -DOSX
Expand Down Expand Up @@ -311,10 +315,15 @@ else
LIBRARIES += cblas atlas
endif
else ifeq ($(OSX), 1)
# OS X packages atlas as the vecLib framework
BLAS_INCLUDE ?= /System/Library/Frameworks/vecLib.framework/Versions/Current/Headers/
LIBRARIES += cblas
LDFLAGS += -framework vecLib
ifneq ($(findstring Xcode 6, $(shell xcodebuild -version)),)
BLAS_INCLUDE ?= /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/
LDFLAGS += -framework Accelerate
else
# OS X packages atlas as the vecLib framework
BLAS_INCLUDE ?= /System/Library/Frameworks/vecLib.framework/Versions/Current/Headers/
LDFLAGS += -framework vecLib
endif
endif
endif
INCLUDE_DIRS += $(BLAS_INCLUDE)
Expand Down