Changeset 783 for stable/0.4


Ignore:
Timestamp:
Oct 15, 2011 10:53:32 AM (8 years ago)
Author:
stefan
Message:

merged chgset 782 from trunk

Location:
stable/0.4
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4

    • Property svn:mergeinfo changed
      /trunkmerged: 782
  • stable/0.4/Couenne

  • stable/0.4/Couenne/Makefile.am

    r766 r783  
    8989else
    9090if COIN_CXX_IS_CL
    91         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
     91        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs.txt
    9292else
    9393        echo -L@abs_lib_dir@ -lBonCouenne -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
  • stable/0.4/Couenne/Makefile.in

    r766 r783  
    853853@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    854854@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs couenne > $(addlibsdir)/couenne_addlibs.txt
    855 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs_cpp.txt
     855@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libBonCouenne.lib libCouenne.lib @COUENNELIB_LIBS_INSTALLED@" > $(addlibsdir)/couenne_addlibs.txt
    856856@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lBonCouenne -lCouenne @COUENNELIB_LIBS_INSTALLED@ > $(addlibsdir)/couenne_addlibs.txt
    857857
  • stable/0.4/Couenne/configure

    r761 r783  
    2265622656     # construct dependencies variables from LIBS variables
    2265722657     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    22658      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     22658     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2265922659     # then remove everything of the form -xxx
    2266022660     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22661      BONMIN_DEPENDENCIES=`echo " $BONMIN_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    22662 
    22663        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22661     BONMIN_DEPENDENCIES=`echo " $BONMIN_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22662
     22663       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2266422664
    2266522665  fi
     
    2317923179     # construct dependencies variables from LIBS variables
    2318023180     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    23181      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     23181     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2318223182     # then remove everything of the form -xxx
    2318323183     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    23184      ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    23185 
    23186        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23184     ASL_DEPENDENCIES=`echo " $ASL_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23185
     23186       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2318723187
    2318823188  fi
     
    2390223902     # construct dependencies variables from LIBS variables
    2390323903     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    23904      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     23904     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2390523905     # then remove everything of the form -xxx
    2390623906     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    23907      SCIP_DEPENDENCIES=`echo " $SCIP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    23908 
    23909        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23907     SCIP_DEPENDENCIES=`echo " $SCIP_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     23908
     23909       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2391023910
    2391123911  fi
     
    2441524415     # construct dependencies variables from LIBS variables
    2441624416     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    24417      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     24417     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2441824418     # then remove everything of the form -xxx
    2441924419     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    24420      CPX_DEPENDENCIES=`echo " $CPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    24421 
    24422        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24420     CPX_DEPENDENCIES=`echo " $CPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24421
     24422       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2442324423
    2442424424  fi
     
    2493524935     # construct dependencies variables from LIBS variables
    2493624936     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    24937      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     24937     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2493824938     # then remove everything of the form -xxx
    2493924939     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    24940      GRB_DEPENDENCIES=`echo " $GRB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    24941 
    24942        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24940     GRB_DEPENDENCIES=`echo " $GRB_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     24941
     24942       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2494324943
    2494424944  fi
     
    2544625446     # construct dependencies variables from LIBS variables
    2544725447     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    25448      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     25448     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2544925449     # then remove everything of the form -xxx
    2545025450     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    25451      MSK_DEPENDENCIES=`echo " $MSK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    25452 
    25453        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25451     MSK_DEPENDENCIES=`echo " $MSK_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25452
     25453       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2545425454
    2545525455  fi
     
    2595725957     # construct dependencies variables from LIBS variables
    2595825958     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    25959      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     25959     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2596025960     # then remove everything of the form -xxx
    2596125961     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    25962      SPX_DEPENDENCIES=`echo " $SPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    25963 
    25964        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25962     SPX_DEPENDENCIES=`echo " $SPX_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     25963
     25964       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2596525965
    2596625966  fi
     
    2646826468     # construct dependencies variables from LIBS variables
    2646926469     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    26470      # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     26470     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
    2647126471     # then remove everything of the form -xxx
    2647226472     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    26473      XPR_DEPENDENCIES=`echo " $XPR_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    26474 
    26475        COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26473     XPR_DEPENDENCIES=`echo " $XPR_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     26474
     26475       COUENNELIB_DEPENDENCIES=`echo " $COUENNELIB_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2647626476
    2647726477  fi
  • stable/0.4/Couenne/src/bound_tightening/twoImpliedBT/Makefile.in

    r766 r783  
    1515@SET_MAKE@
    1616
    17 # $Id: Makefile.am 624 2011-06-09 15:21:30Z stefan $
     17# $Id: Makefile.am 766 2011-08-14 11:18:22Z stefan $
    1818#
    1919# Copyright (C) 2006 International Business Machines and others.
  • stable/0.4/Couenne/src/branch

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/0.4/Couenne/src/expression/operators/exprGroup.cpp

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