mirror of
https://github.com/opencv/opencv.git
synced 2024-11-26 20:20:20 +08:00
Merge pull request #9815 from alalek:issue_9813
This commit is contained in:
commit
92a0808379
@ -38,7 +38,9 @@ file(GLOB highgui_ext_hdrs
|
|||||||
list(REMOVE_ITEM highgui_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/highgui_winrt.hpp")
|
list(REMOVE_ITEM highgui_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/highgui_winrt.hpp")
|
||||||
|
|
||||||
if(HAVE_QT5)
|
if(HAVE_QT5)
|
||||||
set(CMAKE_AUTOMOC ON)
|
# "Automoc" doesn't work properly with opencv_world build, use QT5_WRAP_CPP() directly
|
||||||
|
#set(CMAKE_AUTOMOC ON)
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
|
||||||
QT5_ADD_RESOURCES(_RCC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.qrc)
|
QT5_ADD_RESOURCES(_RCC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.qrc)
|
||||||
|
Loading…
Reference in New Issue
Block a user