generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-04-26 12:09:27 +00:00
parent 6f82c0d662
commit 0cfcb48796
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenCVModule.cmake
View File

@ -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()

1
modules/ffmpeg/CMakeLists.txt
View File

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

2
modules/highgui/CMakeLists.txt
View File

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