qt: fix non-world builds

3ae75159 · Alexander Alekhin · 29b0ef44 · 3ae75159
Commit 3ae75159 authored Oct 09, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CMakeLists.txt modules/highgui/CMakeLists.txt +3 -1

No files found.
--- 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)