Changeset 2432


Ignore:
Timestamp:
Sep 3, 2011 4:07:59 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev2431

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

    • Property svn:mergeinfo changed
      /trunkmerged: 2431
  • stable/0.7/coin.m4

    r2424 r2432  
    35273527     # construct dependencies variables from LIBS variables
    35283528     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    3529      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     3529     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    35303530     # then remove everything of the form -xxx
    35313531     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    3532      m4_toupper($1)_DEPENDENCIES=`echo " $m4_toupper($1)_LIBS" | [sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
     3532     m4_toupper($1)_DEPENDENCIES=`echo " $m4_toupper($1)_LIBS" | [sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
    35333533     coin_foreach_w([myvar], [$3], [
    3534        m4_toupper(myvar)_DEPENDENCIES=`echo " $m4_toupper(myvar)_LIBS " | [sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
     3534       m4_toupper(myvar)_DEPENDENCIES=`echo " $m4_toupper(myvar)_LIBS " | [sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
    35353535     ])
    35363536  fi
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.