Changeset 972 for trunk


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

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

Location:
trunk/Couenne/src/main
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/Makefile.am

    r971 r972  
    5858########################################################################
    5959
     60if COIN_CXX_IS_CL
    6061install-exec-hook:
    61         if COIN_CXX_IS_CL
    62                 test -s couenne.exe.manifest && \
    63                 mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
    64                 cp couenne.exe $(bindir)/couenne.exe
    65         endif
     62        test -s couenne.exe.manifest && \
     63        mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
     64        cp couenne.exe $(bindir)/couenne.exe
     65endif
    6666
  • trunk/Couenne/src/main/Makefile.in

    r971 r972  
    600600        @echo "This command is intended for maintainers to use"
    601601        @echo "it deletes files that may require special tools to rebuild."
     602@COIN_CXX_IS_CL_FALSE@install-exec-hook:
    602603clean: clean-am
    603604
     
    673674########################################################################
    674675
    675 install-exec-hook:
    676         if COIN_CXX_IS_CL
    677                 test -s couenne.exe.manifest && \
    678                 mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
    679                 cp couenne.exe $(bindir)/couenne.exe
    680         endif
     676@COIN_CXX_IS_CL_TRUE@install-exec-hook:
     677@COIN_CXX_IS_CL_TRUE@   test -s couenne.exe.manifest && \
     678@COIN_CXX_IS_CL_TRUE@   mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
     679@COIN_CXX_IS_CL_TRUE@   cp couenne.exe $(bindir)/couenne.exe
    681680# Tell versions [3.59,3.63) of GNU make to not export all variables.
    682681# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.