diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-16 12:34:44 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-08-16 12:34:44 +0200 |
| commit | 4a396a608aefc3282baea76bc4e1965faa99b4f8 (patch) | |
| tree | 1d41969dd8c747f9150256ebffbddedb426e2238 /build/linux/Makefile.in | |
| parent | d9261bdb05cd0863a2c3747c812871dbb851646e (diff) | |
| download | astra-4a396a608aefc3282baea76bc4e1965faa99b4f8.tar.gz astra-4a396a608aefc3282baea76bc4e1965faa99b4f8.tar.bz2 astra-4a396a608aefc3282baea76bc4e1965faa99b4f8.tar.xz astra-4a396a608aefc3282baea76bc4e1965faa99b4f8.zip | |
Check for the mex -R2017b option in configure
Since we use mex for linking, but CXX for compiling, we also need to
set a preprocessor macro to emulate the -R2017b option. Currently we
use -DMATLAB_MEXCMD_RELEASE=700, but it is unclear if this is the
recommended way.
This is required to build with Matlab R2018a and newer.
Diffstat (limited to 'build/linux/Makefile.in')
| -rw-r--r-- | build/linux/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 078a1a2..209206e 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -67,7 +67,7 @@ endif ifeq ($(matlab),yes) # TODO: Do we also want -fopenmp for octave? -CPPFLAGS+=-I$(MATLAB_ROOT)/extern/include -DMATLAB_MEX_FILE +CPPFLAGS+=-I$(MATLAB_ROOT)/extern/include -DMATLAB_MEX_FILE @CPPFLAGS_MATLAB@ ifeq ($(macos),no) CXXFLAGS+=-fopenmp LDFLAGS+=-fopenmp @@ -101,7 +101,7 @@ endif CPPFLAGS+=-I$(srcdir)/../../include -I$(srcdir)/../../lib/include ifeq ($(matlab),yes) -MEXFLAGS = -cxx +MEXFLAGS = @MEXFLAGS@ -cxx MEXLDFLAGS=\$$LDFLAGS $(MODLDFLAGS) MEXLIBS = -lut MEXSUFFIX = @MEXSUFFIX@ |