Changeset 980


Ignore:
Timestamp:
Jul 25, 2013 11:19:30 AM (7 years ago)
Author:
stefan
Message:

merge r979 from trunk

Location:
stable/0.4/Couenne
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne

  • stable/0.4/Couenne/src

  • stable/0.4/Couenne/src/main/Makefile.am

    r973 r980  
    5151########################################################################
    5252
     53if COIN_HAS_ASL
    5354if COIN_CXX_IS_CL
    5455install-exec-hook:
     
    5758        cp couenne.exe $(bindir)/couenne.exe
    5859endif
    59 
     60endif
  • stable/0.4/Couenne/src/main/Makefile.in

    r973 r980  
    595595        @echo "it deletes files that may require special tools to rebuild."
    596596@COIN_CXX_IS_CL_FALSE@install-exec-hook:
     597@COIN_HAS_ASL_FALSE@install-exec-hook:
    597598clean: clean-am
    598599
     
    668669########################################################################
    669670
    670 @COIN_CXX_IS_CL_TRUE@install-exec-hook:
    671 @COIN_CXX_IS_CL_TRUE@   test -s couenne.exe.manifest && \
    672 @COIN_CXX_IS_CL_TRUE@   mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
    673 @COIN_CXX_IS_CL_TRUE@   cp couenne.exe $(bindir)/couenne.exe
     671@COIN_CXX_IS_CL_TRUE@@COIN_HAS_ASL_TRUE@install-exec-hook:
     672@COIN_CXX_IS_CL_TRUE@@COIN_HAS_ASL_TRUE@        test -s couenne.exe.manifest && \
     673@COIN_CXX_IS_CL_TRUE@@COIN_HAS_ASL_TRUE@        mt -manifest couenne.exe.manifest -outputresource:couenne.exe;\
     674@COIN_CXX_IS_CL_TRUE@@COIN_HAS_ASL_TRUE@        cp couenne.exe $(bindir)/couenne.exe
    674675# Tell versions [3.59,3.63) of GNU make to not export all variables.
    675676# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.