Ignore:
Timestamp:
Jul 3, 2013 5:04:17 AM (6 years ago)
Author:
stefan
Message:

merge r1965, r1966, r1967 from trunk

Location:
stable/1.15/Clp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/src

  • stable/1.15/Clp/src/Makefile.am

    r1910 r1968  
    262262includecoin_HEADERS += CbcOrClpParam.cpp
    263263
     264########################################################################
     265#                     Installing manifest (MSVC++)                     #
     266########################################################################
     267
     268if COIN_CXX_IS_CL
     269install-exec-hook:
     270        test -s clp.exe.manifest && \
     271        mt -manifest clp.exe.manifest -outputresource:clp.exe;\
     272        cp clp.exe $(bindir)/clp.exe
     273endif
     274
     275#######################################################################
     276# Create the Config.h file that has all public defines and install it #
     277#######################################################################
     278
    264279install-exec-local:
    265280        $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h
Note: See TracChangeset for help on using the changeset viewer.