Changeset 1967 for trunk


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

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

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r1966 r1967  
    267267########################################################################
    268268
     269if COIN_CXX_IS_CL
    269270install-exec-hook:
    270         if COIN_CXX_IS_CL
    271                 test -s clp.exe.manifest && \
    272                 mt -manifest clp.exe.manifest -outputresource:clp.exe;\
    273                 cp clp.exe $(bindir)/clp.exe
    274         endif
     271        test -s clp.exe.manifest && \
     272        mt -manifest clp.exe.manifest -outputresource:clp.exe;\
     273        cp clp.exe $(bindir)/clp.exe
     274endif
    275275
    276276#######################################################################
  • trunk/Clp/src/Makefile.in

    r1966 r1967  
    11571157        @echo "This command is intended for maintainers to use"
    11581158        @echo "it deletes files that may require special tools to rebuild."
     1159@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    11591160clean: clean-recursive
    11601161
     
    12371238########################################################################
    12381239
    1239 install-exec-hook:
    1240         if COIN_CXX_IS_CL
    1241                 test -s clp.exe.manifest && \
    1242                 mt -manifest clp.exe.manifest -outputresource:clp.exe;\
    1243                 cp clp.exe $(bindir)/clp.exe
    1244         endif
     1240@COIN_CXX_IS_CL_TRUE@install-exec-hook:
     1241@COIN_CXX_IS_CL_TRUE@   test -s clp.exe.manifest && \
     1242@COIN_CXX_IS_CL_TRUE@   mt -manifest clp.exe.manifest -outputresource:clp.exe;\
     1243@COIN_CXX_IS_CL_TRUE@   cp clp.exe $(bindir)/clp.exe
    12451244
    12461245#######################################################################
Note: See TracChangeset for help on using the changeset viewer.