Changeset 1968 for stable


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

merge r1965, r1966, r1967 from trunk

Location:
stable/1.15/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/Makefile.am

    r1910 r1968  
    262262includecoin_HEADERS += CbcOrClpParam.cpp
    263263
     264########################################################################
     265#                     Installing manifest (MSVC++)                     #
     266########################################################################
     267
     268if COIN_CXX_IS_CL
     269install-exec-hook:
     270        test -s clp.exe.manifest && \
     271        mt -manifest clp.exe.manifest -outputresource:clp.exe;\
     272        cp clp.exe $(bindir)/clp.exe
     273endif
     274
     275#######################################################################
     276# Create the Config.h file that has all public defines and install it #
     277#######################################################################
     278
    264279install-exec-local:
    265280        $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h
  • stable/1.15/Clp/src/Makefile.in

    r1960 r1968  
    11461146        @echo "This command is intended for maintainers to use"
    11471147        @echo "it deletes files that may require special tools to rebuild."
     1148@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    11481149clean: clean-recursive
    11491150
     
    11711172install-exec-am: install-binPROGRAMS install-exec-local \
    11721173        install-libLTLIBRARIES
     1174        @$(NORMAL_INSTALL)
     1175        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    11731176
    11741177install-info: install-info-recursive
     
    12081211        dvi dvi-am html html-am info info-am install install-am \
    12091212        install-binPROGRAMS install-data install-data-am install-exec \
    1210         install-exec-am install-exec-local install-includecoinHEADERS \
    1211         install-info install-info-am install-libLTLIBRARIES \
    1212         install-man install-strip installcheck installcheck-am \
    1213         installdirs installdirs-am maintainer-clean \
     1213        install-exec-am install-exec-hook install-exec-local \
     1214        install-includecoinHEADERS install-info install-info-am \
     1215        install-libLTLIBRARIES install-man install-strip installcheck \
     1216        installcheck-am installdirs installdirs-am maintainer-clean \
    12141217        maintainer-clean-generic maintainer-clean-recursive \
    12151218        mostlyclean mostlyclean-compile mostlyclean-generic \
     
    12201223
    12211224
     1225########################################################################
     1226#                     Installing manifest (MSVC++)                     #
     1227########################################################################
     1228
     1229@COIN_CXX_IS_CL_TRUE@install-exec-hook:
     1230@COIN_CXX_IS_CL_TRUE@   test -s clp.exe.manifest && \
     1231@COIN_CXX_IS_CL_TRUE@   mt -manifest clp.exe.manifest -outputresource:clp.exe;\
     1232@COIN_CXX_IS_CL_TRUE@   cp clp.exe $(bindir)/clp.exe
     1233
     1234#######################################################################
     1235# Create the Config.h file that has all public defines and install it #
     1236#######################################################################
     1237
    12221238install-exec-local:
    12231239        $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h
Note: See TracChangeset for help on using the changeset viewer.