Changeset 287


Ignore:
Timestamp:
Mar 28, 2007 1:02:10 AM (14 years ago)
Author:
andreasw
Message:

fixing a few things for Cygwin compile with native MS/Intel compilers

Location:
ThirdParty/Mumps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/Makefile.am

    r247 r287  
    7575
    7676# Reset DEFS to that they don't show up for the Fortran compiler
    77 DEFS = $(MY_DEFS)
     77DEFS =
     78CFLAGS += $(MY_DEFS)
    7879
    7980########################################################################
  • ThirdParty/Mumps/trunk/Makefile.in

    r247 r287  
    137137CCDEPMODE = @CCDEPMODE@
    138138CDEFS = @CDEFS@
    139 CFLAGS = @CFLAGS@
     139CFLAGS = @CFLAGS@ $(MY_DEFS)
    140140COIN_BUILD_MUMPS_FALSE = @COIN_BUILD_MUMPS_FALSE@
    141141COIN_BUILD_MUMPS_TRUE = @COIN_BUILD_MUMPS_TRUE@
     
    153153
    154154# Reset DEFS to that they don't show up for the Fortran compiler
    155 DEFS = $(MY_DEFS)
     155DEFS =
    156156DEPDIR = @DEPDIR@
    157157ECHO = @ECHO@
  • ThirdParty/Mumps/trunk/configure

    r279 r287  
    34153415          ifort* | */ifort* | IFORT* | */IFORT* )
    34163416            coin_opt_fflags='-O3'
    3417             coin_add_fflags='-nologo -MT'
     3417            coin_add_fflags='-fpp -nologo -MT'
    34183418            coin_dbg_fflags='-debug'
    34193419          ;;
     
    2103921039            -e 's/$AR t/lib -nologo -list/' \
    2104021040            -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    21041             -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     21041            -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \\
     21042            -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    2104221043        libtool > conftest.bla
    2104321044
     
    2150221503  coin_need_flibs=yes
    2150321504
    21504   MUMPS_INCFLAGS="-I`$CYGPATH_W $coin_mumpssrcdir/MUMPS/libseq` -I`$CYGPATH_W $coin_mumpssrcdir/MUMPS/include`"
     21505  MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $coin_mumpssrcdir/MUMPS/libseq\` -I\`\$(CYGPATH_W) $coin_mumpssrcdir/MUMPS/include\`"
    2150521506
    2150621507fi
     
    2152721528
    2152821529
     21530echo "$as_me:$LINENO: checking whether MUMPS is available" >&5
     21531echo $ECHO_N "checking whether MUMPS is available... $ECHO_C" >&6
     21532
    2152921533if test x"$use_mumps" = x || test "$use_mumps" = no; then
    2153021534  coin_has_mumps=no
     
    2153721541
    2153821542fi
     21543echo "$as_me:$LINENO: result: $coin_has_mumps" >&5
     21544echo "${ECHO_T}$coin_has_mumps" >&6
    2153921545
    2154021546
Note: See TracChangeset for help on using the changeset viewer.