Changeset 1935 for trunk


Ignore:
Timestamp:
Jun 28, 2013 9:50:35 AM (6 years ago)
Author:
tkr
Message:

Updates to allow installig of manifest (sorry for the multiple commits)

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1934 r1935  
    264264########################################################################
    265265
     266if COIN_CXX_IS_CL
    266267install-exec-hook:
    267         if COIN_CXX_IS_CL
    268                 test -s cbc.exe.manifest && \
    269                 mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    270                 cp cbc.exe $(bindir)/clp.exe
    271         endif
     268        test -s cbc.exe.manifest && \
     269        mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
     270        cp cbc.exe $(bindir)/clp.exe
     271endif
    272272
    273273#######################################################################
     
    276276
    277277install-exec-local:
    278         $(INSTALL_MANIFEST)
    279278        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h
    280279
  • trunk/Cbc/src/Makefile.in

    r1934 r1935  
    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
     
    12771278########################################################################
    12781279
    1279 install-exec-hook:
    1280         if COIN_CXX_IS_CL
    1281                 test -s cbc.exe.manifest && \
    1282                 mt -manifest cbc.exe.manifest -outputresource:cbc.exe;\
    1283                 cp cbc.exe $(bindir)/clp.exe
    1284         endif
     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
    12851284
    12861285#######################################################################
     
    12891288
    12901289install-exec-local:
    1291         $(INSTALL_MANIFEST)
    12921290        $(install_sh_DATA) config_cbc.h $(DESTDIR)$(includecoindir)/CbcConfig.h
    12931291
Note: See TracChangeset for help on using the changeset viewer.