bugfix for highgui crash on Windows in debug mode (ticket #752) has been propagated from branch 2.2 to trunk
This commit is contained in:
parent
6f82c0d662
commit
0cfcb48796
@ -66,7 +66,7 @@ macro(define_opencv_module name)
|
||||
)
|
||||
endif()
|
||||
set_target_properties(${the_target} PROPERTIES
|
||||
LINK_FLAGS "/NODEFAULTLIB:libc"
|
||||
LINK_FLAGS "/NODEFAULTLIB:libc /DEBUG"
|
||||
)
|
||||
endif()
|
||||
|
||||
|
@ -45,6 +45,7 @@ set_target_properties(${the_target} PROPERTIES
|
||||
DEFINE_SYMBOL "CVAPI_EXPORTS"
|
||||
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
|
||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
|
||||
LINK_FLAGS "/NODEFAULTLIB:libc /DEBUG"
|
||||
)
|
||||
|
||||
install(TARGETS ${the_target}
|
||||
|
@ -263,7 +263,7 @@ set_target_properties(${the_target} PROPERTIES
|
||||
)
|
||||
|
||||
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)
|
||||
|
||||
# Dependencies of this target:
|
||||
|
Loading…
x
Reference in New Issue
Block a user