Make ts always static.

This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY macros and to get rid of the dependency on cvconfig.h.
2013-08-06 17:56:25 +04:00
parent 2911b12145
commit 131458847b
2 changed files with 1 additions and 17 deletions
--- a/modules/ts/include/opencv2/ts/ts.hpp
+++ b/modules/ts/include/opencv2/ts/ts.hpp
@@ -1,13 +1,6 @@
 #ifndef __OPENCV_GTESTCV_HPP__
 #define __OPENCV_GTESTCV_HPP__

-#include "cvconfig.h"
-#ifndef GTEST_CREATE_SHARED_LIBRARY
-#ifdef BUILD_SHARED_LIBS
-#define GTEST_LINKED_AS_SHARED_LIBRARY 1
-#endif
-#endif
-
 #include <stdarg.h> // for va_list

 #ifdef HAVE_WINRT