Changeset 1740 for stable


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

merge chgset 1739 from trunk

Location:
stable/2.7
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • stable/2.7

    • Property svn:mergeinfo changed
      /trunkmerged: 1739

  • stable/2.7/Cbc

  • stable/2.7/Cbc/Makefile.am

    r1715 r1740  
    138138else
    139139if COIN_CXX_IS_CL
    140         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     140        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    141141else
    142142        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt

  • stable/2.7/Cbc/Makefile.in

    r1715 r1740  
    979979@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
    980980@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    981 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     981@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    982982@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    983983
Note: See TracChangeset for help on using the changeset viewer.