This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d6566e24776e7253b926a1a924b977d0f844c9ab (commit)
via ec358d17a77635a59aa09c5dbd7a6cd3b0cf000d (commit)
via b421c2477c4c4f9d4c93997661f1698812cdae36 (commit)
from b973dab101c577752f0f247f22dc265e839d7bd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6566e24776e7253b926a1a924b977d0f844c9ab
commit d6566e24776e7253b926a1a924b977d0f844c9ab
Merge: b973dab ec358d1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 21 11:04:07 2011 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 21 11:04:07 2011 -0500
Merge topic 'update-KWIML' into next
ec358d1 Merge branch 'upstream-kwiml' into update-KWIML
b421c24 KWIML: Avoid MSVC linker warning about not using C++ runtime
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec358d17a77635a59aa09c5dbd7a6cd3b0cf000d
commit ec358d17a77635a59aa09c5dbd7a6cd3b0cf000d
Merge: 5796f88 b421c24
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 21 11:03:29 2011 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 21 11:03:29 2011 -0500
Merge branch 'upstream-kwiml' into update-KWIML
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b421c2477c4c4f9d4c93997661f1698812cdae36
commit b421c2477c4c4f9d4c93997661f1698812cdae36
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 21 11:02:26 2011 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 21 11:02:26 2011 -0500
KWIML: Avoid MSVC linker warning about not using C++ runtime
Teach KWIML_test to use part of the C++ runtime library. Otherwise the
linker complains:
warning LNK4089: all references to 'MSVCP71.dll' discarded by /OPT:REF
diff --git a/test/test_include_CXX.cxx b/test/test_include_CXX.cxx
index 057b7c2..111311a 100644
--- a/test/test_include_CXX.cxx
+++ b/test/test_include_CXX.cxx
@@ -11,6 +11,12 @@
============================================================================*/
#include <string>
+#if defined(_MSC_VER) && defined(NDEBUG)
+// Use C++ runtime to avoid linker warning:
+// warning LNK4089: all references to 'MSVCP71.dll' discarded by /OPT:REF
+std::string test_include_CXX_use_stl_string;
+#endif
+
/* Test KWIML header inclusion after above system headers. */
#include "test.h"
#include KWIML_HEADER(ABI.h)
-----------------------------------------------------------------------
Summary of changes:
Utilities/KWIML/test/test_include_CXX.cxx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
