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

Merge pull request #959 from SpecLad:qt4-build

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-07 11:27:45 +04:00 committed by OpenCV Buildbot
commit 9b46c6fb8a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVFindLibsGUI.cmake
View File

@ -33,7 +33,7 @@ if(WITH_QT)
endif() endif()
if(NOT HAVE_QT) if(NOT HAVE_QT)
find_package(Qt4) find_package(Qt4 REQUIRED QtCore QtGui QtTest)
if(QT4_FOUND) if(QT4_FOUND)
set(HAVE_QT TRUE) set(HAVE_QT TRUE)
add_definitions(-DHAVE_QT) # We need to define the macro this way, using cvconfig.h does not work add_definitions(-DHAVE_QT) # We need to define the macro this way, using cvconfig.h does not work

6
modules/highgui/CMakeLists.txt
View File

@ -95,14 +95,10 @@ elseif(HAVE_QT)
endif() endif()
include(${QT_USE_FILE}) include(${QT_USE_FILE})
if(QT_INCLUDE_DIR)
ocv_include_directories(${QT_INCLUDE_DIR})
endif()
QT4_ADD_RESOURCES(_RCC_OUTFILES src/window_QT.qrc) QT4_ADD_RESOURCES(_RCC_OUTFILES src/window_QT.qrc)
QT4_WRAP_CPP(_MOC_OUTFILES src/window_QT.h) QT4_WRAP_CPP(_MOC_OUTFILES src/window_QT.h)
list(APPEND HIGHGUI_LIBRARIES ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY}) list(APPEND HIGHGUI_LIBRARIES ${QT_LIBRARIES})
list(APPEND highgui_srcs src/window_QT.cpp ${_MOC_OUTFILES} ${_RCC_OUTFILES}) list(APPEND highgui_srcs src/window_QT.cpp ${_MOC_OUTFILES} ${_RCC_OUTFILES})
ocv_check_flag_support(CXX -Wno-missing-declarations _have_flag) ocv_check_flag_support(CXX -Wno-missing-declarations _have_flag)
if(${_have_flag}) if(${_have_flag})