Changeset 2122


Ignore:
Timestamp:
Mar 9, 2015 11:16:55 AM (4 years ago)
Author:
tkr
Message:

Merging r2121 from trunk

Location:
stable/1.16/Clp
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16/Clp

  • stable/1.16/Clp/Makefile.am

    r2107 r2122  
    121121
    122122addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
    123        
     123
    124124install-data-hook:
    125125        @$(mkdir_p) "$(addlibsdir)"
     
    129129else
    130130if COIN_CXX_IS_CL
    131         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
     131        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClpSolver.lib libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
    132132else
    133133        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
  • stable/1.16/Clp/Makefile.in

    r2107 r2122  
    920920@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
    921921@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
    922 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
     922@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClpSolver.lib libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
    923923@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
    924924
  • stable/1.16/Clp/clp-uninstalled.pc.in

    r1734 r2122  
    66URL: https://projects.coin-or.org/Clp
    77Version: @PACKAGE_VERSION@
    8 Libs: ${libdir}/libClp.la @CLPLIB_PCLIBS@
     8Libs: ${libdir}/libClpSolver.la ${libdir}/libClp.la @CLPLIB_PCLIBS@
    99Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/src
    1010Requires: @CLPLIB_PCREQUIRES@
  • stable/1.16/Clp/src

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • stable/1.16/Clp/src/OsiClp

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