Commit 0cfcb487 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

bugfix for highgui crash on Windows in debug mode (ticket #752) has been…

bugfix for highgui crash on Windows in debug mode (ticket #752) has been propagated from branch 2.2 to trunk
parent 6f82c0d6
...@@ -66,7 +66,7 @@ macro(define_opencv_module name) ...@@ -66,7 +66,7 @@ macro(define_opencv_module name)
) )
endif() endif()
set_target_properties(${the_target} PROPERTIES set_target_properties(${the_target} PROPERTIES
LINK_FLAGS "/NODEFAULTLIB:libc" LINK_FLAGS "/NODEFAULTLIB:libc /DEBUG"
) )
endif() endif()
......
...@@ -45,6 +45,7 @@ set_target_properties(${the_target} PROPERTIES ...@@ -45,6 +45,7 @@ set_target_properties(${the_target} PROPERTIES
DEFINE_SYMBOL "CVAPI_EXPORTS" DEFINE_SYMBOL "CVAPI_EXPORTS"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
LINK_FLAGS "/NODEFAULTLIB:libc /DEBUG"
) )
install(TARGETS ${the_target} install(TARGETS ${the_target}
......
...@@ -263,7 +263,7 @@ set_target_properties(${the_target} PROPERTIES ...@@ -263,7 +263,7 @@ set_target_properties(${the_target} PROPERTIES
) )
if(MSVC) if(MSVC)
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib") set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
endif(MSVC) endif(MSVC)
# Dependencies of this target: # Dependencies of this target:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment