Merge 3b4b92487a into ce3c6681c9

1 month ago · 54d3b10058
parent ce3c6681c9 3b4b92487a
commit 54d3b10058
1 changed files with 8 additions and 2 deletions
--- a/modules/cvv/CMakeLists.txt
+++ b/modules/cvv/CMakeLists.txt
@ -15,8 +15,14 @@ endif()

 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${CVV_QT_MODULES})

-set(CMAKE_AUTOMOC ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+if(BUILD_opencv_world)
+  set(CMAKE_AUTOMOC ON PARENT_SCOPE)
+  set(CMAKE_INCLUDE_CURRENT_DIR ON PARENT_SCOPE)
+else()
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_INCLUDE_CURRENT_DIR ON)
+endif()
+
 foreach(module ${CVV_QT_MODULES})
  list(APPEND CVV_LIBRARIES ${Qt${QT_VERSION_MAJOR}${module}_LIBRARIES})
 endforeach()