projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6cb1036
)
Fixing static libs build on Windows
author
Andrey Pavlenko
<no@email>
Thu, 8 Sep 2011 13:13:37 +0000
(13:13 +0000)
committer
Andrey Pavlenko
<no@email>
Thu, 8 Sep 2011 13:13:37 +0000
(13:13 +0000)
modules/ts/include/opencv2/ts/ts.hpp
patch
|
blob
|
history
diff --git
a/modules/ts/include/opencv2/ts/ts.hpp
b/modules/ts/include/opencv2/ts/ts.hpp
index
bcaa691
..
c3603d2
100644
(file)
--- a/
modules/ts/include/opencv2/ts/ts.hpp
+++ b/
modules/ts/include/opencv2/ts/ts.hpp
@@
-1,9
+1,14
@@
#ifndef __OPENCV_GTESTCV_HPP__
#define __OPENCV_GTESTCV_HPP__
+#if HAVE_CVCONFIG_H
+#include "cvconfig.h"
+#endif
#ifndef GTEST_CREATE_SHARED_LIBRARY
+#ifdef BUILD_SHARED_LIBS
#define GTEST_LINKED_AS_SHARED_LIBRARY 1
#endif
+#endif
#ifdef ANDROID
# include <android/api-level.h>