Commit 13145884 authored by Roman Donchenko's avatar Roman Donchenko

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.
parent 2911b121
...@@ -4,10 +4,7 @@ if(IOS) ...@@ -4,10 +4,7 @@ if(IOS)
ocv_module_disable(ts) ocv_module_disable(ts)
endif() endif()
if(MINGW) set(OPENCV_MODULE_TYPE STATIC)
set(OPENCV_MODULE_TYPE STATIC)
endif()
set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
if(HAVE_CUDA) if(HAVE_CUDA)
...@@ -22,10 +19,4 @@ ocv_glob_module_sources() ...@@ -22,10 +19,4 @@ ocv_glob_module_sources()
ocv_module_include_directories() ocv_module_include_directories()
ocv_create_module() ocv_create_module()
if(BUILD_SHARED_LIBS AND NOT MINGW)
add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=1)
else()
add_definitions(-DGTEST_CREATE_SHARED_LIBRARY=0)
endif()
ocv_add_precompiled_headers(${the_module}) ocv_add_precompiled_headers(${the_module})
#ifndef __OPENCV_GTESTCV_HPP__ #ifndef __OPENCV_GTESTCV_HPP__
#define __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 #include <stdarg.h> // for va_list
#ifdef HAVE_WINRT #ifdef HAVE_WINRT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment