Changeset 1968 for stable

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:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (4 diffs)

stable/1.15/Clp/src/Makefile.am

@@ -262 +262 @@
 includecoin_HEADERS += CbcOrClpParam.cpp
 
+########################################################################
+#                     Installing manifest (MSVC++)                     #
+########################################################################
+
+if COIN_CXX_IS_CL
+install-exec-hook:
+        test -s clp.exe.manifest && \
+        mt -manifest clp.exe.manifest -outputresource:clp.exe;\
+        cp clp.exe $(bindir)/clp.exe
+endif
+
+#######################################################################
+# Create the Config.h file that has all public defines and install it #
+#######################################################################
+
 install-exec-local:
         $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h

stable/1.15/Clp/src/Makefile.in

@@ -1146 +1146 @@
         @echo "This command is intended for maintainers to use"
         @echo "it deletes files that may require special tools to rebuild."
+@COIN_CXX_IS_CL_FALSE@install-exec-hook:
 clean: clean-recursive
 
@@ -1171 +1172 @@
 install-exec-am: install-binPROGRAMS install-exec-local \
         install-libLTLIBRARIES
+        @$(NORMAL_INSTALL)
+        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 
 install-info: install-info-recursive
@@ -1208 +1211 @@
         dvi dvi-am html html-am info info-am install install-am \
         install-binPROGRAMS install-data install-data-am install-exec \
-        install-exec-am install-exec-local install-includecoinHEADERS \
-        install-info install-info-am install-libLTLIBRARIES \
-        install-man install-strip installcheck installcheck-am \
-        installdirs installdirs-am maintainer-clean \
+        install-exec-am install-exec-hook install-exec-local \
+        install-includecoinHEADERS install-info install-info-am \
+        install-libLTLIBRARIES install-man install-strip installcheck \
+        installcheck-am installdirs installdirs-am maintainer-clean \
         maintainer-clean-generic maintainer-clean-recursive \
         mostlyclean mostlyclean-compile mostlyclean-generic \
@@ -1220 +1223 @@
 
 
+########################################################################
+#                     Installing manifest (MSVC++)                     #
+########################################################################
+
+@COIN_CXX_IS_CL_TRUE@install-exec-hook:
+@COIN_CXX_IS_CL_TRUE@   test -s clp.exe.manifest && \
+@COIN_CXX_IS_CL_TRUE@   mt -manifest clp.exe.manifest -outputresource:clp.exe;\
+@COIN_CXX_IS_CL_TRUE@   cp clp.exe $(bindir)/clp.exe
+
+#######################################################################
+# Create the Config.h file that has all public defines and install it #
+#######################################################################
+
 install-exec-local:
         $(install_sh_DATA) config_clp.h $(DESTDIR)$(includecoindir)/ClpConfig.h