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

Fixed few MinGW build problems

Browse Source
This commit is contained in:
Andrey Kamaev 2012-05-20 18:45:19 +00:00
parent 5a3cbadfe3
commit c9027fecc0
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVDetectPython.cmake
View File

@ -1,4 +1,4 @@
if(MSVC AND NOT PYTHON_EXECUTABLE) if(WIN32 AND NOT PYTHON_EXECUTABLE)
# search for executable with the same bitness as resulting binaries # search for executable with the same bitness as resulting binaries
# standard FindPythonInterp always prefers executable from system path # standard FindPythonInterp always prefers executable from system path
# this is really important because we are using the interpreter for numpy search and for choosing the install location # this is really important because we are using the interpreter for numpy search and for choosing the install location

19
cmake/OpenCVUtils.cmake
View File

@ -11,7 +11,7 @@ if(NOT COMMAND find_host_program)
endmacro() endmacro()
endif() endif()
#added include directories in such way that directories from the OpenCV source tree go first # adds include directories in such way that directories from the OpenCV source tree go first
function(ocv_include_directories) function(ocv_include_directories)
set(__add_before "") set(__add_before "")
foreach(dir ${ARGN}) foreach(dir ${ARGN})
@ -25,6 +25,12 @@ function(ocv_include_directories)
include_directories(BEFORE ${__add_before}) include_directories(BEFORE ${__add_before})
endfunction() endfunction()
# clears all passed variables
macro(ocv_clear_vars)
foreach(_var ${ARGN})
unset(${_var} CACHE)
endforeach()
endmacro()
# Provides an option that the user can optionally select. # Provides an option that the user can optionally select.
# Can accept condition to control when option is available for user. # Can accept condition to control when option is available for user.
@ -352,10 +358,11 @@ macro(ocv_parse_header2 LIBNAME HDR_PATH VARNAME SCOPE)
set(${LIBNAME}_VERSION_STRING "${${LIBNAME}_VERSION_STRING}.${${LIBNAME}_VERSION_TWEAK}" ${SCOPE}) set(${LIBNAME}_VERSION_STRING "${${LIBNAME}_VERSION_STRING}.${${LIBNAME}_VERSION_TWEAK}" ${SCOPE})
endif() endif()
else() else()
unset(${LIBNAME}_VERSION_MAJOR CACHE) ocv_clear_vars(${LIBNAME}_VERSION_MAJOR
unset(${LIBNAME}_VERSION_MINOR CACHE) ${LIBNAME}_VERSION_MAJOR
unset(${LIBNAME}_VERSION_PATCH CACHE) ${LIBNAME}_VERSION_MINOR
unset(${LIBNAME}_VERSION_TWEAK CACHE) ${LIBNAME}_VERSION_PATCH
unset(${LIBNAME}_VERSION_STRING CACHE) ${LIBNAME}_VERSION_TWEAK
${LIBNAME}_VERSION_STRING)
endif() endif()
endmacro() endmacro()

11
modules/highgui/src/window_w32.cpp
View File

@ -978,6 +978,11 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
DWORD defStyle = WS_VISIBLE | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU; DWORD defStyle = WS_VISIBLE | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU;
int len; int len;
CvRect rect; CvRect rect;
#ifdef HAVE_OPENGL
bool useGl;
HDC hGLDC;
HGLRC hGLRC;
#endif
cvInitSystem(0,0); cvInitSystem(0,0);
@ -1013,9 +1018,9 @@ CV_IMPL int cvNamedWindow( const char* name, int flags )
if (flags & CV_WINDOW_OPENGL) if (flags & CV_WINDOW_OPENGL)
CV_ERROR( CV_OpenGlNotSupported, "Library was built without OpenGL support" ); CV_ERROR( CV_OpenGlNotSupported, "Library was built without OpenGL support" );
#else #else
bool useGl = false; useGl = false;
HDC hGLDC = 0; hGLDC = 0;
HGLRC hGLRC = 0; hGLRC = 0;
if (flags & CV_WINDOW_OPENGL) if (flags & CV_WINDOW_OPENGL)
createGlContext(hWnd, hGLDC, hGLRC, useGl); createGlContext(hWnd, hGLDC, hGLRC, useGl);