projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1580806
)
fixed compilation on Mingw64
author
Alexander Shishkov
<no@email>
Tue, 14 Jun 2011 13:40:08 +0000
(13:40 +0000)
committer
Alexander Shishkov
<no@email>
Tue, 14 Jun 2011 13:40:08 +0000
(13:40 +0000)
OpenCVModule.cmake
patch
|
blob
|
history
diff --git
a/OpenCVModule.cmake
b/OpenCVModule.cmake
index
8cf4f21
..
7a19a7b
100644
(file)
--- a/
OpenCVModule.cmake
+++ b/
OpenCVModule.cmake
@@
-28,8
+28,11
@@
macro(define_opencv_module name)
source_group("Include" FILES ${lib_hdrs})
set(the_target "opencv_${name}")
-
- add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs})
+ if (${name} MATCHES "ts" AND MINGW)
+ add_library(${the_target} STATIC ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs})
+ else()
+ add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs})
+ endif()
# For dynamic link numbering convenions
if(NOT ANDROID)