generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ts always static.

Browse Source 
This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
This commit is contained in:
Roman Donchenko
2013-08-06 17:56:25 +04:00
parent 2911b12145
commit 131458847b
2 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/ts/CMakeLists.txt
View File

@@ -4,10 +4,7 @@ if(IOS)
ocv_module_disable(ts)
endif()
if(MINGW)
set(OPENCV_MODULE_TYPE STATIC)
endif()
set(OPENCV_MODULE_TYPE STATIC)
set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
if(HAVE_CUDA)
@@ -22,10 +19,4 @@ ocv_glob_module_sources()
ocv_module_include_directories()
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})