Changeset 1936 for stable/2.8


Ignore:
Timestamp:
Jul 3, 2013 5:12:23 AM (6 years ago)
Author:
stefan
Message:

merge r1933, r1934, r1935 from trunk

Location:
stable/2.8/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/src/Makefile.am

    r1902 r1936  
    260260        ClpAmplObjective.hpp
    261261
     262########################################################################
     263#                     Installing manifest (MSVC++)                     #
     264########################################################################
     265
     266if COIN_CXX_IS_CL
     267install-exec-hook:
     268        test -s cbc.exe.manifest && \
     269        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     270        cp cbc.exe $(bindir)/clp.exe
     271endif
     272
    262273#######################################################################
    263274# Create the Config.h file that has all public defines and install it #
  • stable/2.8/Cbc/src/Makefile.in

    r1930 r1936  
    11971197        @echo "This command is intended for maintainers to use"
    11981198        @echo "it deletes files that may require special tools to rebuild."
     1199@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    11991200clean: clean-recursive
    12001201
     
    12221223install-exec-am: install-binPROGRAMS install-exec-local \
    12231224        install-libLTLIBRARIES
     1225        @$(NORMAL_INSTALL)
     1226        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    12241227
    12251228install-info: install-info-recursive
     
    12591262        dvi dvi-am html html-am info info-am install install-am \
    12601263        install-binPROGRAMS install-data install-data-am install-exec \
    1261         install-exec-am install-exec-local install-includecoinHEADERS \
    1262         install-info install-info-am install-libLTLIBRARIES \
    1263         install-man install-strip installcheck installcheck-am \
    1264         installdirs installdirs-am maintainer-clean \
     1264        install-exec-am install-exec-hook install-exec-local \
     1265        install-includecoinHEADERS install-info install-info-am \
     1266        install-libLTLIBRARIES install-man install-strip installcheck \
     1267        installcheck-am installdirs installdirs-am maintainer-clean \
    12651268        maintainer-clean-generic maintainer-clean-recursive \
    12661269        mostlyclean mostlyclean-compile mostlyclean-generic \
     
    12711274
    12721275
     1276########################################################################
     1277#                     Installing manifest (MSVC++)                     #
     1278########################################################################
     1279
     1280@COIN_CXX_IS_CL_TRUE@install-exec-hook:
     1281@COIN_CXX_IS_CL_TRUE@   test -s cbc.exe.manifest && \
     1282@COIN_CXX_IS_CL_TRUE@   mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     1283@COIN_CXX_IS_CL_TRUE@   cp cbc.exe $(bindir)/clp.exe
     1284
    12731285#######################################################################
    12741286# Create the Config.h file that has all public defines and install it #
Note: See TracChangeset for help on using the changeset viewer.