Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex

2013-05-22 12:57:04 +04:00
parent b5c013682b 0e8c2b0395
commit 7efb24917f
3 changed files with 29 additions and 1 deletions
--- a/modules/ts/include/opencv2/ts.hpp
+++ b/modules/ts/include/opencv2/ts.hpp
@@ -4,6 +4,14 @@
 #include "opencv2/core/cvdef.h"
 #include <stdarg.h> // for va_list

+#include "cvconfig.h"
+
+#ifndef GTEST_CREATE_SHARED_LIBRARY
+#ifdef BUILD_SHARED_LIBS
+#define GTEST_LINKED_AS_SHARED_LIBRARY 1
+#endif
+#endif
+
 #ifdef _MSC_VER
 #pragma warning( disable: 4127 )
 #endif