diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-09-30 19:01:58 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-09-30 19:01:58 +0300 |
| commit | eedc83800a867d34156b5c313510707a17016c6b (patch) | |
| tree | e2f5a0fc92887ff915f37815d0f8cfe902032c2e /debian/patches/revert-Make-ts-always-static | |
| download | opencv-eedc83800a867d34156b5c313510707a17016c6b.tar.gz | |
Imported opencv 2.4.9.1+dfsg1-2debian/2.4.9.1+dfsg1-2debian
Diffstat (limited to 'debian/patches/revert-Make-ts-always-static')
| -rw-r--r-- | debian/patches/revert-Make-ts-always-static | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/debian/patches/revert-Make-ts-always-static b/debian/patches/revert-Make-ts-always-static new file mode 100644 index 0000000..3a2a59d --- /dev/null +++ b/debian/patches/revert-Make-ts-always-static @@ -0,0 +1,51 @@ +Description: Revert commit 131458847bbf2fe971c6b5e40a8b59d0d48b0d0c + This commit disable building shared library of TS. +Author: Nobuhiro Iwamatsu <iwamatsu@debian.org> +Forwarded: no +Last-Update: <2014-01-14> + +diff --git a/modules/ts/include/opencv2/ts/ts.hpp b/modules/ts/include/opencv2/ts/ts.hpp +index 8ea1ad9..3ac7db2 100644 +--- a/modules/ts/include/opencv2/ts/ts.hpp ++++ b/modules/ts/include/opencv2/ts/ts.hpp +@@ -1,6 +1,13 @@ + #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 +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index bb56da2..38864a4 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,7 +4,10 @@ if(IOS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) ++if(MINGW) ++ set(OPENCV_MODULE_TYPE STATIC) ++endif() ++ + set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) +@@ -15,4 +18,10 @@ 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}) |