Changeset 18477

Timestamp:

09/02/14 09:40:22 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed problem for matlab v2014+

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -272 +272 @@
                         ;;
                    *)
-           MEXLINK=$(mex -v 2>&1 < /dev/null | grep LDFLAGS     | sed -e "s/         LDFLAGS            = //       g" | sed -e "s/-[[^ ]]*mexFunction\\.map//g")
+           MEXLINK=$($MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDFLAGS     | sed -e "s/         LDFLAGS            = //g")
            MEXLIB=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep CXXLIBS     | sed -e "s/         CXXLIBS            = //g")
                      MEXEXT=$( $MATLAB_ROOT/bin/mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/         LDEXTENSION        = //g")
@@ -286 +286 @@
                                          rm -f conftest.tmp
                                 fi
+
+                                dnl Make sure mexFunction.map is not in MEXLIB to avoid problems with global variables
+                                MEXLINK=$(echo $MEXLINK | sed -e "s/-[[^ ]]*mexFunction\\.map//g")
 
                         ;;