Skip to content
Snippets Groups Projects
Verified Commit e3ff2f10 authored by Sébastien Villemot's avatar Sébastien Villemot
Browse files

Build system: with Octave 10, MEX files must now be linked with liboctmex

parent 85bea5a6
No related branches found
No related tags found
No related merge requests found
......@@ -199,7 +199,11 @@ else # Octave build
octave_incflags = run_command(mkoctfile_exe, '-p', 'INCFLAGS', check : true).stdout().split()
octlibdir = run_command(mkoctfile_exe, '-p', 'OCTLIBDIR', check : true).stdout().strip()
octave_libs = run_command(mkoctfile_exe, '-p', 'OCTAVE_LIBS', check : true).stdout().split()
if octave_version.version_compare('<10')
octave_libs = run_command(mkoctfile_exe, '-p', 'OCTAVE_LIBS', check : true).stdout().split()
else
octave_libs = run_command(mkoctfile_exe, '-p', 'LIBOCTMEX', check : true).stdout().split()
endif
octave_link_args = []
......
......@@ -105,6 +105,8 @@ fi
: ${OCTAVE_LIBS="$LIBOCTINTERP $LIBOCTAVE $SPECIAL_MATH_LIB"}
: ${LIBOCTMEX="-loctmex"}
# Local variables.
FFTW_LIBS="$FFTW3_LDFLAGS $FFTW3_LIBS $FFTW3F_LDFLAGS $FFTW3F_LIBS"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment