Mercurial > forge

changeset 12557:b0e00812d4ee octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
on MacOSX do not compile with OpenMP
author schloegl
date Sat, 24 Jan 2015 15:47:52 +0000
parents cb741b7e2be2
children b228d1439ee5
files extra/NaN/src/Makefile extra/tsa/src/Makefile
diffstat 2 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/extra/NaN/src/Makefile	Sat Jan 24 15:09:30 2015 +0000
+++ b/extra/NaN/src/Makefile	Sat Jan 24 15:47:52 2015 +0000
@@ -37,6 +37,11 @@
 OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
 RM      = rm
 
+ifneq (Darwin,$(shell uname)) 
+CFLAGS      += -fopenmp 
+MEX_OPTION  += -lgomp 
+endif 
+ 
 MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
 MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
 
--- a/extra/tsa/src/Makefile	Sat Jan 24 15:09:30 2015 +0000
+++ b/extra/tsa/src/Makefile	Sat Jan 24 15:47:52 2015 +0000
@@ -39,14 +39,17 @@
 W32_LIBS += $(LDLIBS_W32)libblas.a
 W64_LIBS += $(LDLIBS_W64)libblas.a
 
-
-
 CC  	= gcc
 CXX 	= g++
-CFLAGS 	= -fopenmp -Wall -Wextra -Wconversion -O2 -fPIC 
+CFLAGS 	= -Wall -Wextra -Wconversion -O2 -fPIC 
 OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
 RM      = rm
 
+ifneq (Darwin,$(shell uname))
+CFLAGS      += -fopenmp
+MEX_OPTION  += -lgomp
+endif
+
 MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
 MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)