Changeset 1933 for trunk/Cbc/src


Ignore:
Timestamp:
Jun 27, 2013 3:28:48 PM (6 years ago)
Author:
tkr
Message:

Change to allow embedding of manifest

Location:
trunk/Cbc/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.am

    r1898 r1933  
    260260        ClpAmplObjective.hpp
    261261
     262########################################################################
     263#                     Installing manifest (MSVC++)                     #
     264########################################################################
     265
     266install-exec-hook:
     267        test -s cbc.exe.manifest && \
     268        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     269        cp cbc.exe $(bindir)/clp.exe
     270
    262271#######################################################################
    263272# Create the Config.h file that has all public defines and install it #
     
    265274
    266275install-exec-local:
     276        $(INSTALL_MANIFEST)
    267277        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h
    268278
  • trunk/Cbc/src/Makefile.in

    r1899 r1933  
    452452ac_ct_CXX = @ac_ct_CXX@
    453453ac_ct_F77 = @ac_ct_F77@
     454ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    454455ac_ct_RANLIB = @ac_ct_RANLIB@
    455456ac_ct_STRIP = @ac_ct_STRIP@
    456457ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    457 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    458458am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    459459am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    12221222install-exec-am: install-binPROGRAMS install-exec-local \
    12231223        install-libLTLIBRARIES
     1224        @$(NORMAL_INSTALL)
     1225        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
    12241226
    12251227install-info: install-info-recursive
     
    12591261        dvi dvi-am html html-am info info-am install install-am \
    12601262        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 \
     1263        install-exec-am install-exec-hook install-exec-local \
     1264        install-includecoinHEADERS install-info install-info-am \
     1265        install-libLTLIBRARIES install-man install-strip installcheck \
     1266        installcheck-am installdirs installdirs-am maintainer-clean \
    12651267        maintainer-clean-generic maintainer-clean-recursive \
    12661268        mostlyclean mostlyclean-compile mostlyclean-generic \
     
    12711273
    12721274
     1275########################################################################
     1276#                     Installing manifest (MSVC++)                     #
     1277########################################################################
     1278
     1279install-exec-hook:
     1280        test -s cbc.exe.manifest && \
     1281        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     1282        cp cbc.exe $(bindir)/clp.exe
     1283
    12731284#######################################################################
    12741285# Create the Config.h file that has all public defines and install it #
     
    12761287
    12771288install-exec-local:
     1289        $(INSTALL_MANIFEST)
    12781290        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h
    12791291
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1899 r1933  
    371371ac_ct_CXX = @ac_ct_CXX@
    372372ac_ct_F77 = @ac_ct_F77@
     373ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
    373374ac_ct_RANLIB = @ac_ct_RANLIB@
    374375ac_ct_STRIP = @ac_ct_STRIP@
    375376ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
    376 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    377377am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    378378am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
Note: See TracChangeset for help on using the changeset viewer.