bugfix for highgui crash on Windows in debug mode (ticket #752) has been propagated from branch 2.2 to trunk

14 years ago · 0cfcb48796
parent 6f82c0d662
commit 0cfcb48796
3 changed files with 3 additions and 2 deletions
--- 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()

--- 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}
--- 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: