From 3ae75159550d9b4c65ee675527ccae46df605481 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 9 Oct 2017 22:12:52 +0300 Subject: [PATCH] qt: fix non-world builds --- modules/highgui/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index c117043..99d7188 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -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") 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) QT5_ADD_RESOURCES(_RCC_OUTFILES ${CMAKE_CURRENT_LIST_DIR}/src/window_QT.qrc) -- 2.7.4