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:
8b43e90
)
fixed problem with static compilation of highgui_tests on Windows
author
Alexander Shishkov
<no@email>
Thu, 2 Jun 2011 10:02:08 +0000
(10:02 +0000)
committer
Alexander Shishkov
<no@email>
Thu, 2 Jun 2011 10:02:08 +0000
(10:02 +0000)
modules/highgui/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/modules/highgui/CMakeLists.txt
b/modules/highgui/CMakeLists.txt
index
38e099f
..
27ed6af
100644
(file)
--- a/
modules/highgui/CMakeLists.txt
+++ b/
modules/highgui/CMakeLists.txt
@@
-412,6
+412,9
@@
if(BUILD_TESTS)
add_test(${the_target} "${LOC}")
if(WIN32)
+ if (MSVC AND NOT BUILD_SHARED_LIBS)
+ set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
+ endif()
install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
endif()
endif(BUILD_TESTS)