From 0cfcb487960b3b25eb36498aabe565a17ed992fe Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 26 Apr 2011 12:09:27 +0000 Subject: [PATCH] bugfix for highgui crash on Windows in debug mode (ticket #752) has been propagated from branch 2.2 to trunk --- OpenCVModule.cmake | 2 +- modules/ffmpeg/CMakeLists.txt | 1 + modules/highgui/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenCVModule.cmake b/OpenCVModule.cmake index 13ea835fa..f922dde11 100644 --- a/OpenCVModule.cmake +++ b/OpenCVModule.cmake @@ -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() diff --git a/modules/ffmpeg/CMakeLists.txt b/modules/ffmpeg/CMakeLists.txt index f613ffdeb..80e9d45c9 100644 --- a/modules/ffmpeg/CMakeLists.txt +++ b/modules/ffmpeg/CMakeLists.txt @@ -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} diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 1a268bff3..92c7cab8c 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -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: