Changeset 2284


Ignore:
Timestamp:
Jun 15, 2011 8:02:55 AM (8 years ago)
Author:
stefan
Message:

rerun autotools; merge fixes in example Makefiles for mingw/cl from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/stable/1.2/configure

    r2186 r2284  
    28232823        coin_opt_cflags="-O3"
    28242824        coin_add_cflags="-pipe"
    2825         coin_dbg_cflags="-g"
     2825        coin_dbg_cflags="-g -O0"
    28262826        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
    28272827        case $build in
     
    35843584    coin_opt_fflags="-O3"
    35853585    coin_add_fflags="-pipe"
    3586     coin_dbg_fflags="-g"
     3586    coin_dbg_fflags="-g -O0"
    35873587    case $enable_doscompile in
    35883588      mingw)
     
    2225522255METIS_DATA_INSTALLED=
    2225622256
    22257 # initial list of dependencies is "coinmetis", but we need to filter out version number specifications (= x, <= x, >= x)
     22257# initial list of dependencies is "coinmetis", but we need to filter out version number specifications (= x, <= x, >= x, != x)
    2225822258projtoprocess="coinmetis"
    2225922259
     
    2229422294      # add projrequires to the front of the list of projects that have to be processed next
    2229522295      # at the same time, remove $proj from this list
    22296       projtoprocess=${projtoprocess/$proj/$projrequires}
     22296      projtoprocess=`echo $projtoprocess | sed -e "s/$proj/$projrequires/"`
    2229722297
    2229822298      # read DATA from $pcfile, if _DATA is still empty
     
    2236522365
    2236622366    # set projcflags and projlibs variables by running $pcfilemod
     22367    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    2236722368    projcflags=
    2236822369    projlibs=
     22370    IFS="$save_IFS"
    2236922371    eval `sh -c "$pcfilemod"`
     22372    IFS=":"
    2237022373
    2237122374    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    2241022413
    2241122414    # set projcflags and projlibs variables by running $pcfilemod
     22415    # under mingw, the current IFS seem to make the : in the paths of the gfortran libs go away, so we temporarily set IFS back to its default
    2241222416    projcflags=
    2241322417    projlibs=
     22418    IFS="$save_IFS"
    2241422419    eval `sh -c "$pcfilemod"`
     22420    IFS=":"
    2241522421
    2241622422    # add CYGPATH_W cludge into include flags and set CFLAGS variable
     
    2244322449  # for the LIBS, we replace everything of the form "/somepath/name.lib" by "`$(CYGPATH_W) /somepath/`name.lib | sed -e s|\|/|g" (where we have to use excessive many \ to get the \ into the command line for cl),
    2244422450  # for the LIBS_INSTALLED, we replace everything of the form "/somepath/" by "`$(CYGPATH_W) /somepath/`",
    22445   #    everything of the form "-Lpath" by "/libpath:`$(CYGPATH_W) path`, and
    22446   #    everything of the form "-lname" by "libname.lib"
     22451  #    everything of the form "-lname" by "libname.lib", and
     22452  #    everything of the form "-Lpath" by "-libpath:`$(CYGPATH_W) path`
    2244722453  if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ;
    2244822454  then
    2244922455    METIS_LIBS=`echo " $METIS_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
    22450     METIS_LIBS_INSTALLED=`echo " $METIS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'`
     22456    METIS_LIBS_INSTALLED=`echo " $METIS_LIBS_INSTALLED" | sed -e 's/ \(\/[^ ]*\/\)/ \`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g' -e 's/ -L\([^ ]*\)/ -libpath:\`$(CYGPATH_W) \1\`/g'`
    2245122457  fi
    2245222458
     
    2442324429  fi
    2442424430
     24431  { echo "$as_me:$LINENO: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&5
     24432echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
    2442524433  if test x$coin_projectdir = xyes; then
    2442624434    { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
Note: See TracChangeset for help on using the changeset viewer.