diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake
index 77604eb73d..d9c8defccd 100644
--- a/core/app/DigikamCoreTarget.cmake
+++ b/core/app/DigikamCoreTarget.cmake
@@ -1,354 +1,352 @@
 #
 # Copyright (c) 2010-2020 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 # Copyright (c) 2015      by Veaceslav Munteanu, <veaceslav dot munteanu90 at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 ### digiKam core object library #################################################################################################
 
 set(DIGIKAMCORE_OBJECTS
 
             utils/digikam_debug.cpp
             utils/digikam_version.cpp
 
             $<TARGET_OBJECTS:core_dimg_obj>
             $<TARGET_OBJECTS:core_dragdrop_obj>
             $<TARGET_OBJECTS:core_dmetadata_obj>
             $<TARGET_OBJECTS:core_jpegutils_obj>
             $<TARGET_OBJECTS:core_progressmanager_obj>
             $<TARGET_OBJECTS:core_threadimageio_obj>
             $<TARGET_OBJECTS:core_pgfutils_obj>
             $<TARGET_OBJECTS:core_dthread_obj>
             $<TARGET_OBJECTS:core_versionmanager_obj>
             $<TARGET_OBJECTS:core_kmemoryinfo_obj>
             $<TARGET_OBJECTS:core_libraw_obj>
             $<TARGET_OBJECTS:core_rawengine_obj>
             $<TARGET_OBJECTS:core_dpluginsinterface_obj>
             $<TARGET_OBJECTS:core_libwso2_obj>
 
             $<TARGET_OBJECTS:core_libmd5_obj>
             $<TARGET_OBJECTS:core_libxmp_obj>
             $<TARGET_OBJECTS:core_libdng_obj>
             $<TARGET_OBJECTS:core_dngwriter_obj>
 
             # widgets
             $<TARGET_OBJECTS:core_digikamwidgets_obj>
             $<TARGET_OBJECTS:core_digikamdialogs_obj>
             $<TARGET_OBJECTS:core_itemproperties_obj>
             $<TARGET_OBJECTS:core_digikamgenericmodels_obj>
             $<TARGET_OBJECTS:core_notificationmanager_obj>
 
             # utilities
             $<TARGET_OBJECTS:core_setupcommon_obj>
             $<TARGET_OBJECTS:core_slideshow_obj>
             $<TARGET_OBJECTS:core_imageeditor_obj>
             $<TARGET_OBJECTS:core_libtransitionmngr_obj>
             $<TARGET_OBJECTS:core_timeadjust_obj>
 
             $<TARGET_OBJECTS:core_digikamdatabase_obj>
             $<TARGET_OBJECTS:core_digikamfacesengine_obj>
 )
 
 if(ENABLE_MEDIAPLAYER)
 
     set(DIGIKAMCORE_OBJECTS
         ${DIGIKAMCORE_OBJECTS}
         $<TARGET_OBJECTS:core_videotools_obj>
     )
 
 endif()
 
 if(Marble_FOUND)
 
     set(DIGIKAMCORE_OBJECTS
         ${DIGIKAMCORE_OBJECTS}
         $<TARGET_OBJECTS:core_geoiface_obj>
         $<TARGET_OBJECTS:core_geomapwrapper_obj>
     )
 
 endif()
 
 if(KF5FileMetaData_FOUND)
 
     set(DIGIKAMCORE_OBJECTS
         ${DIGIKAMCORE_OBJECTS}
         $<TARGET_OBJECTS:core_baloowrap_obj>
     )
 
 endif()
 
 if(KF5AkonadiContact_FOUND)
 
     set(DIGIKAMCORE_OBJECTS
         ${DIGIKAMCORE_OBJECTS}
         $<TARGET_OBJECTS:core_akonadiiface_obj>
     )
 
 endif()
 
 add_library(digikamcore
             SHARED
             ${DIGIKAMCORE_OBJECTS}
 )
 
 set_target_properties(digikamcore PROPERTIES
                       VERSION ${DIGIKAM_VERSION_SHORT}
                       SOVERSION ${DIGIKAM_VERSION_SHORT}
 )
 
 target_compile_definitions(digikamcore
                            PRIVATE
                            digikamcore_EXPORTS
 )
 
 add_dependencies(digikamcore digikam-gitversion)
 
 # All codes from this target are exported with digikam_core_export.h header and DIGIKAM_EXPORT macro.
 generate_export_header(digikamcore
                        BASE_NAME digikam
                        EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/utils/digikam_core_export.h"
 )
 
-# Note all this target dependencies must be private and not exported to prevent inherited external plugins dependencies.
+# NOTE: all this target dependencies must be private and not exported to prevent inherited dependencies on external plugins.
 
 target_link_libraries(digikamcore
 
                       PRIVATE
 
                       Qt5::Core
                       Qt5::Gui
                       Qt5::Xml
                       Qt5::XmlPatterns
                       Qt5::Widgets
                       Qt5::Sql
                       Qt5::PrintSupport
                       Qt5::Concurrent
 
                       KF5::Solid
                       KF5::WindowSystem
                       KF5::ConfigGui
                       KF5::XmlGui
                       KF5::I18n
                       KF5::Service
 
                       # Required by CImg which use pthread internally.
 
                       ${CMAKE_THREAD_LIBS_INIT}
                       ${EXPAT_LIBRARY}
 
                       ${LCMS2_LIBRARIES} # filters
 
                       ${TIFF_LIBRARIES}
                       PNG::PNG
                       ${JPEG_LIBRARIES}
                       exiv2lib
 
                       ${FFMPEG_LIBRARIES}
 
                       ${OPENMP_LDFLAGS}
 
-                      PUBLIC
-
                       opencv_core
                       opencv_objdetect
                       opencv_imgproc
                       opencv_imgcodecs
                       opencv_dnn
                       opencv_flann
 )
 
 if(ENABLE_QWEBENGINE)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           Qt5::WebEngineWidgets
     )
 
 else()
 
     target_link_libraries(digikamcore
                           PRIVATE
                           Qt5::WebKitWidgets
     )
 
 endif()
 
 if(ENABLE_DBUS)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           Qt5::DBus
     )
 
 endif()
 
 if(KF5IconThemes_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           KF5::IconThemes
     )
 
 endif()
 
 if(KF5KIO_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           KF5::KIOCore
                           KF5::KIOWidgets
     )
 
 endif()
 
 if(KF5Notifications_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           KF5::Notifications
     )
 
 endif()
 
 if(KF5NotifyConfig_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           KF5::NotifyConfig
     )
 
 endif()
 
 if(Marble_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${MARBLE_LIBRARIES}
     )
 
 endif()
 
 if(X11_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           Qt5::X11Extras
                           ${X11_LIBRARIES}
     )
 
 endif()
 
 if(Jasper_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${JASPER_LIBRARIES}
     )
 
 endif()
 
 # LibLqr-1 library rules for content-aware filter
 if(Lqr-1_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${LQR-1_LIBRARIES}
     )
 
 endif()
 
 if(LensFun_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${LENSFUN_LIBRARIES}
     )
 
 endif()
 
 if(ImageMagick_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${ImageMagick_LIBRARIES}
     )
 
 endif()
 
 # for nrfilter
 if(OpenCV_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${OpenCV_LIBRARIES}
     )
 
 endif()
 
 if(KF5FileMetaData_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           KF5::FileMetaData
     )
 
 endif()
 
 if(KF5AkonadiContact_FOUND)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           KF5::AkonadiContact
     )
 
 endif()
 
 if(APPLE)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           /System/Library/Frameworks/AppKit.framework
     )
 
 endif()
 
 if(WIN32)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           wsock32
                           ws2_32
     )
 
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${KVM_LIBRARY}
     )
 
 endif()
 
 if(ENABLE_MEDIAPLAYER)
 
     target_link_libraries(digikamcore
                           PRIVATE
                           ${QTAV_LIBRARIES}
     )
 
 endif()
 
 ### Install Rules ###############################################################################################################
 
 install(TARGETS digikamcore EXPORT DigikamCoreConfig ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(EXPORT DigikamCoreConfig DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DigikamCore" NAMESPACE Digikam::)
 
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/DigikamCoreConfigVersion.cmake
                                  VERSION ${DIGIKAM_VERSION_SHORT}
                                  COMPATIBILITY SameMajorVersion)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DigikamCoreConfigVersion.cmake
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DigikamCore")
diff --git a/core/app/DigikamDatabaseTarget.cmake b/core/app/DigikamDatabaseTarget.cmake
index 526b68f8a5..a4873f0685 100644
--- a/core/app/DigikamDatabaseTarget.cmake
+++ b/core/app/DigikamDatabaseTarget.cmake
@@ -1,68 +1,75 @@
 #
 # Copyright (c) 2010-2020 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 # Copyright (c) 2015      by Veaceslav Munteanu, <veaceslav dot munteanu90 at gmail dot com>
 # Copyright (c) 2015      by Mohamed_Anwer, <m_dot_anwer at gmx dot com>
 # Copyright (C) 2018      by Mario Frank,   <mario dot frank at uni minus potsdam dot de>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 ### digiKam database shared library target ######################################################################################
 
 add_library(digikamdatabase SHARED $<TARGET_OBJECTS:digikamdatabase_obj>)
 
 set_target_properties(digikamdatabase PROPERTIES
                       VERSION ${DIGIKAM_VERSION_SHORT}
                       SOVERSION ${DIGIKAM_VERSION_SHORT}
 )
 
 target_compile_definitions(digikamdatabase
                            PRIVATE
                            digikamdatabase_EXPORTS
 )
 
 add_dependencies(digikamdatabase digikamcore)
 
 # All codes from this target are exported with digikam_database_export.h header and DIGIKAM_DATABASE_EXPORT macro.
 generate_export_header(digikamdatabase
                        BASE_NAME digikam_database
                        EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/utils/digikam_database_export.h"
 )
 
-# Note all this target dependencies must be private and not exported to prevent inherited external plugins dependencies.
+# NOTE: all this target dependencies must be private and not exported to prevent inherited dependencies on external plugins.
 
 target_link_libraries(digikamdatabase
 
                       PRIVATE
 
                       Qt5::Core
                       Qt5::Gui
                       Qt5::Sql
 
                       KF5::ConfigCore
                       KF5::Solid
                       KF5::I18n
 
                       digikamcore
+
+                      opencv_core
+                      opencv_objdetect
+                      opencv_imgproc
+                      opencv_imgcodecs
+                      opencv_dnn
+                      opencv_flann
 )
 
 if(ENABLE_DBUS)
 
     target_link_libraries(digikamdatabase
                           PRIVATE
                           Qt5::DBus
     )
 
 endif()
 
 ### Install Rules ###############################################################################################################
 
 install(TARGETS digikamdatabase EXPORT DigikamDatabaseConfig ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(EXPORT DigikamDatabaseConfig DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DigikamDatabase" NAMESPACE Digikam::)
 
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/DigikamDatabaseConfigVersion.cmake
                                  VERSION ${DIGIKAM_VERSION_SHORT}
                                  COMPATIBILITY SameMajorVersion)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DigikamDatabaseConfigVersion.cmake
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DigikamDatabase")
diff --git a/core/app/DigikamGuiTarget.cmake b/core/app/DigikamGuiTarget.cmake
index ad8a863e04..2e772ddcc9 100644
--- a/core/app/DigikamGuiTarget.cmake
+++ b/core/app/DigikamGuiTarget.cmake
@@ -1,344 +1,351 @@
 #
 # Copyright (c) 2010-2020 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 # Copyright (c) 2015      by Veaceslav Munteanu, <veaceslav dot munteanu90 at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 ### digiKam GUI object library ##################################################################################################
 
 if(ENABLE_DBUS)
     qt5_add_dbus_adaptor(digikamadaptor_SRCS
                          main/org.kde.digikam.xml
                          main/digikamapp.h
                          Digikam::DigikamApp)
 endif()
 
 set(libdigikamgui_SRCS
 
     main/digikamapp.cpp
     main/digikamapp_solid.cpp
     main/digikamapp_camera.cpp
     main/digikamapp_import.cpp
     main/digikamapp_config.cpp
     main/digikamapp_tools.cpp
     main/digikamapp_setup.cpp
 
     date/dpopupframe.cpp
     date/ddateedit.cpp
     date/ddatetable.cpp
     date/ddatetable_p.cpp
     date/ddatepicker.cpp
     date/ddatepicker_p.cpp
     date/ddatetimeedit.cpp
     date/ddatepickerpopup.cpp
     date/datefolderview.cpp
     date/monthwidget.cpp
     date/timelinewidget.cpp
 
     dragdrop/importdragdrop.cpp
     dragdrop/albumdragdrop.cpp
     dragdrop/ddragobjects.cpp
     dragdrop/itemdragdrop.cpp
     dragdrop/tagdragdrop.cpp
 
     filters/filtersidebarwidget.cpp
     filters/tagfilterview.cpp
 
     items/delegate/digikamitemdelegate.cpp
     items/delegate/itemdelegate.cpp
     items/delegate/itemfacedelegate.cpp
     items/views/digikamitemview.cpp
     items/views/digikamitemview_p.cpp
     items/views/itemcategorizedview.cpp
     items/thumbbar/itemthumbnailbar.cpp
     items/thumbbar/itemthumbnaildelegate.cpp
     items/overlays/assignnameoverlay.cpp
     items/overlays/facerejectionoverlay.cpp
     items/overlays/groupindicatoroverlay.cpp
     items/overlays/itemfullscreenoverlay.cpp
     items/overlays/itemratingoverlay.cpp
     items/overlays/itemrotationoverlay.cpp
     items/overlays/itemcoordinatesoverlay.cpp
     items/overlays/itemselectionoverlay.cpp
     items/utils/itemviewutilities.cpp
     items/utils/tooltipfiller.cpp
     items/utils/contextmenuhelper.cpp
     items/utils/groupingviewimplementation.cpp
     items/utils/itemcategorydrawer.cpp
 
     views/tableview/tableview.cpp
     views/tableview/tableview_treeview.cpp
     views/tableview/tableview_treeview_delegate.cpp
     views/tableview/tableview_column_configuration_dialog.cpp
     views/tableview/tableview_model.cpp
     views/tableview/tableview_columns.cpp
     views/tableview/tableview_column_audiovideo.cpp
     views/tableview/tableview_column_file.cpp
     views/tableview/tableview_column_geo.cpp
     views/tableview/tableview_column_digikam.cpp
     views/tableview/tableview_column_item.cpp
     views/tableview/tableview_column_photo.cpp
     views/tableview/tableview_column_thumbnail.cpp
     views/tableview/tableview_columnfactory.cpp
     views/tableview/tableview_selection_model_syncer.cpp
 
     views/stack/itemiconview.cpp
     views/stack/itemiconview_albums.cpp
     views/stack/itemiconview_groups.cpp
     views/stack/itemiconview_items.cpp
     views/stack/itemiconview_search.cpp
     views/stack/itemiconview_sidebars.cpp
     views/stack/itemiconview_slideshow.cpp
     views/stack/itemiconview_tags.cpp
     views/stack/itemiconview_tools.cpp
     views/stack/itemiconview_views.cpp
     views/stack/itemiconview_zoom.cpp
     views/stack/trashview.cpp
     views/stack/stackedview.cpp
     views/stack/welcomepageview.cpp
     views/preview/itempreviewcanvas.cpp
     views/preview/itempreviewview.cpp
 
     views/sidebar/albumfolderviewsidebarwidget.cpp
     views/sidebar/datefolderviewsidebarwidget.cpp
     views/sidebar/timelinesidebarwidget.cpp
     views/sidebar/searchsidebarwidget.cpp
     views/sidebar/fuzzysearchsidebarwidget.cpp
     views/sidebar/labelssidebarwidget.cpp
     views/sidebar/peoplesidebarwidget.cpp
     views/sidebar/tagviewsidebarwidget.cpp
     views/sidebar/sidebarwidget.cpp
 
     views/utils/dmodelfactory.cpp
     views/utils/slideshowbuilder.cpp
     views/utils/componentsinfodlg.cpp
 
     ${digikamadaptor_SRCS}
 )
 
 if(${Marble_FOUND})
     set(libdigikamgui_SRCS
         ${libdigikamgui_SRCS}
         views/stack/mapwidgetview.cpp
         views/sidebar/gpssearchsidebarwidget.cpp
        )
 endif()
 
 # FIXME
 #
 #if(ENABLE_DIGIKAM_MODELTEST)
 #    message(STATUS "Modeltest enabled")
 #
 #    set(libdigikamgui_SRCS ${libdigikamgui_SRCS}
 #        modeltest/modeltest.cpp)
 #
 #    add_definitions(-DENABLE_DIGIKAM_MODELTEST)
 #endif()
 
 add_library(gui_digikam_obj
             OBJECT
             ${libdigikamgui_SRCS}
 )
 
 target_compile_definitions(gui_digikam_obj
                            PRIVATE
                            digikamgui_EXPORTS
 )
 
 ### digiKam GUI shared library objects declaration ##############################################################################
 
 set(DIGIKAMGUI_OBJECTS
 
             $<TARGET_OBJECTS:gui_digikam_obj>
 
             # Libs
             $<TARGET_OBJECTS:gui_digikamdatabasemain_obj>
             $<TARGET_OBJECTS:gui_digikamfacesenginedatabase_obj>
             $<TARGET_OBJECTS:gui_digikamdeletedialog_obj>
             $<TARGET_OBJECTS:gui_digikamtemplate_obj>
             $<TARGET_OBJECTS:gui_itempropertiesdigikam_obj>
             $<TARGET_OBJECTS:gui_digikammodels_obj>
             $<TARGET_OBJECTS:gui_digikamalbum_obj>
             $<TARGET_OBJECTS:gui_fileactionmanager_obj>
             $<TARGET_OBJECTS:gui_digikamtags_obj>
             $<TARGET_OBJECTS:gui_digikamsettings_obj>
             $<TARGET_OBJECTS:gui_filters_obj>
             $<TARGET_OBJECTS:gui_imagehistorywidgets_obj>
             $<TARGET_OBJECTS:gui_iojobs_obj>
             $<TARGET_OBJECTS:gui_dtrash_obj>
 
             # Utilities
             $<TARGET_OBJECTS:gui_setup_obj>
             $<TARGET_OBJECTS:gui_lighttable_obj>
             $<TARGET_OBJECTS:gui_maintenance_obj>
             $<TARGET_OBJECTS:gui_searchwindow_obj>
             $<TARGET_OBJECTS:gui_firstrun_obj>
             $<TARGET_OBJECTS:gui_fuzzysearch_obj>
             $<TARGET_OBJECTS:gui_imageeditorgui_obj>
             $<TARGET_OBJECTS:gui_importui_obj>
             $<TARGET_OBJECTS:gui_importuibackend_obj>
             $<TARGET_OBJECTS:gui_facemanagement_obj>
             $<TARGET_OBJECTS:gui_queuemanager_obj>
             $<TARGET_OBJECTS:gui_advancedrename_obj>
 )
 
 if(${Marble_FOUND})
 
     set(DIGIKAMGUI_OBJECTS
         ${DIGIKAMGUI_OBJECTS}
         $<TARGET_OBJECTS:gui_gpssearch_obj>
     )
 
 endif()
 
 ### digiKam GUI shared library target ###########################################################################################
 
 add_library(digikamgui
             SHARED
             ${DIGIKAMGUI_OBJECTS}
 )
 
 set_target_properties(digikamgui PROPERTIES
                       VERSION ${DIGIKAM_VERSION_SHORT}
                       SOVERSION ${DIGIKAM_VERSION_SHORT}
 )
 
 target_compile_definitions(digikamgui
                            PRIVATE
                            digikamcore_EXPORTS
 )
 
 add_dependencies(digikamgui digikamcore digikamdatabase)
 
 # All codes from this target are exported with digikam_gui_export.h header and DIGIKAM_GUI_EXPORT macro.
 generate_export_header(digikamgui
                        BASE_NAME digikam_gui
                        EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/utils/digikam_gui_export.h"
 )
 
 if(WIN32)
     set_target_properties(digikamgui PROPERTIES COMPILE_FLAGS -DJPEG_STATIC)
 endif()
 
-# Note all this target dependencies must be private and not exported to prevent inherited external plugins dependencies.
+# NOTE: all this target dependencies must be private and not exported to prevent inherited dependencies on external plugins.
 
 target_link_libraries(digikamgui
 
                       PRIVATE
 
                       Qt5::Core
                       Qt5::Gui
                       Qt5::Widgets
                       Qt5::Sql
                       Qt5::PrintSupport
 
                       KF5::XmlGui
                       KF5::Solid
                       KF5::ConfigCore
                       KF5::ConfigGui
                       KF5::Service
                       KF5::WindowSystem
                       KF5::I18n
 
                       digikamcore
                       digikamdatabase
+
+                      opencv_core
+                      opencv_objdetect
+                      opencv_imgproc
+                      opencv_imgcodecs
+                      opencv_dnn
+                      opencv_flann
 )
 
 if(ENABLE_QWEBENGINE)
 
     target_link_libraries(digikamgui
                           PRIVATE
                           Qt5::WebEngineWidgets
     )
 
 else()
 
     target_link_libraries(digikamgui
                           PRIVATE
                           Qt5::WebKitWidgets
     )
 
 endif()
 
 if(ENABLE_DBUS)
 
     target_link_libraries(digikamgui
                           PRIVATE
                           Qt5::DBus
     )
 
 endif()
 
 if(KF5IconThemes_FOUND)
 
     target_link_libraries(digikamgui
                           PRIVATE
                           KF5::IconThemes
     )
 
 endif()
 
 if(KF5KIO_FOUND)
 
     target_link_libraries(digikamgui
                           PRIVATE
                           KF5::KIOWidgets
     )
 
 endif()
 
 if(${Marble_FOUND})
 
      target_link_libraries(digikamgui
                            PRIVATE
                            ${MARBLE_LIBRARIES}
      )
 
 endif()
 
 if(APPLE)
 
     target_link_libraries(digikamgui
                           PRIVATE
                           /System/Library/Frameworks/AppKit.framework
     )
 
 endif()
 
 
 if(NOT WIN32)
 
     # To link under Solaris (see bug #274484)
     target_link_libraries(digikamgui
                           PRIVATE
                           ${MATH_LIBRARY}
     )
 
 endif()
 
 if(Gphoto2_FOUND)
 
     # See bug #258931: libgphoto2 library must be the last arg for linker.
     # See bug #268267 : digiKam need to be linked to libusb to prevent crash
     # at gphoto2 init if opencv is linked with libdc1394. Libusb linking rules are
     # add to gphoto2 linking rules by Gphoto2 cmake detection script.
 
     target_link_libraries(digikamgui
                           PRIVATE
                           ${GPHOTO2_LIBRARIES}
     )
 
 endif()
 
 ### Install Rules ###############################################################################################################
 
 install(TARGETS digikamgui EXPORT DigikamGuiConfig ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(EXPORT DigikamGuiConfig  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DigikamGui" NAMESPACE Digikam::)
 
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/DigikamGuiConfigVersion.cmake
                                  VERSION ${DIGIKAM_VERSION_SHORT}
                                  COMPATIBILITY SameMajorVersion)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DigikamGuiConfigVersion.cmake
         DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DigikamGui")
diff --git a/core/dplugins/bqm/enhance/redeyecorrection/CMakeLists.txt b/core/dplugins/bqm/enhance/redeyecorrection/CMakeLists.txt
index 16a097cbb0..355d24ffda 100644
--- a/core/dplugins/bqm/enhance/redeyecorrection/CMakeLists.txt
+++ b/core/dplugins/bqm/enhance/redeyecorrection/CMakeLists.txt
@@ -1,26 +1,32 @@
 #
 # Copyright (c) 2015-2020 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 APPLY_COMMON_POLICIES()
 
 include(MacroDPlugins)
 
 include_directories($<TARGET_PROPERTY:Qt5::Gui,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 set(redeyecorrectionplugin_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/redeyecorrectionplugin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/redeyecorrection.cpp
 )
 
 DIGIKAM_ADD_BQM_PLUGIN(NAME    RedEyeCorrection
                        SOURCES ${redeyecorrectionplugin_SRCS}
+                       DEPENDS opencv_core
+                               opencv_objdetect
+                               opencv_imgproc
+                               opencv_imgcodecs
+                               opencv_dnn
+                               opencv_flann
 )
diff --git a/core/dplugins/editor/enhance/redeye/CMakeLists.txt b/core/dplugins/editor/enhance/redeye/CMakeLists.txt
index 47ee93f72f..8051d86545 100644
--- a/core/dplugins/editor/enhance/redeye/CMakeLists.txt
+++ b/core/dplugins/editor/enhance/redeye/CMakeLists.txt
@@ -1,26 +1,32 @@
 #
 # Copyright (c) 2015-2020 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 APPLY_COMMON_POLICIES()
 
 include(MacroDPlugins)
 
 include_directories($<TARGET_PROPERTY:Qt5::Gui,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 set(redeyetoolplugin_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/redeyetoolplugin.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/redeyetool.cpp
 )
 
 DIGIKAM_ADD_EDITOR_PLUGIN(NAME    RedEyeTool
                           SOURCES ${redeyetoolplugin_SRCS}
+                          DEPENDS opencv_core
+                                  opencv_objdetect
+                                  opencv_imgproc
+                                  opencv_imgcodecs
+                                  opencv_dnn
+                                  opencv_flann
 )
diff --git a/core/tests/CMakeLists.txt b/core/tests/CMakeLists.txt
index d1c4969c78..98dc94c3a1 100644
--- a/core/tests/CMakeLists.txt
+++ b/core/tests/CMakeLists.txt
@@ -1,160 +1,167 @@
 #
 # Copyright (c) 2010-2020 by Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 APPLY_COMMON_POLICIES()
 
 # enabling for everything although only required by DImg.
 kde_enable_exceptions()
 
 # -------------------------------------------------------------------------------
 # Unit-tests common dependencies
 
 if(ENABLE_QWEBENGINE)
 
     set(_extra_deps ${_extra_deps} Qt5::WebEngineWidgets)
 
 else()
 
     set(_extra_deps ${_extra_deps} Qt5::WebKitWidgets)
 
 endif()
 
 if(ENABLE_DBUS)
 
     set(_extra_deps ${_extra_deps} Qt5::DBus)
 
 endif()
 
 if(KF5Notifications_FOUND)
 
     set(_extra_deps ${_extra_deps} KF5::Notifications)
 
 endif()
 
 if(Gphoto2_FOUND)
 
     set(_extra_deps ${_extra_deps} ${GPHOTO2_LIBRARIES})
 
 endif()
 
 if(ImageMagick_Magick++_FOUND)
 
     set(_extra_deps ${_extra_deps} ${ImageMagick_LIBRARIES})
 
 endif()
 
 if(LensFun_FOUND)
 
     set(_extra_deps ${_extra_deps} ${LENSFUN_LIBRARIES})
 
 endif()
 
 if(Jasper_FOUND)
 
     set(_extra_deps ${_extra_deps} ${JASPER_LIBRARIES})
 
 endif()
 
 if(ENABLE_MEDIAPLAYER)
 
     set(_extra_deps ${_extra_deps} ${QTAV_LIBRARIES})
 
 endif()
 
 if(WIN32)
 
     set(_extra_deps ${_extra_deps} ws2_32)
 
 endif()
 
 if(NOT WIN32)
 
     # To link under Solaris (see bug #274484)
     set(_extra_deps ${_extra_deps} ${MATH_LIBRARY})
 
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
 
     set(_extra_deps ${_extra_deps} ${KVM_LIBRARY})
 
 endif()
 
 if(APPLE)
 
     set(_extra_deps ${_extra_deps} /System/Library/Frameworks/AppKit.framework)
 
 endif()
 
 set(COMMON_TEST_LINK Qt5::Core
                      Qt5::Gui
                      Qt5::Xml
                      Qt5::XmlPatterns
                      Qt5::Widgets
                      Qt5::Concurrent
                      Qt5::Test
                      Qt5::Sql
 
                      KF5::XmlGui
                      KF5::I18n
                      KF5::ConfigCore
                      KF5::Service
                      KF5::Solid
 
                      ${OPENMP_LDFLAGS}
                      ${JPEG_LIBRARIES}
                      ${LCMS2_LIBRARIES}
                      ${EXPAT_LIBRARY}
                      ${CMAKE_THREAD_LIBS_INIT}
 
+                     opencv_core
+                     opencv_objdetect
+                     opencv_imgproc
+                     opencv_imgcodecs
+                     opencv_dnn
+                     opencv_flann
+
                      ${_extra_deps}
 )
 
 # -------------------------------------------------------------------------------
 # Common static library for uint-tests based on ModelTest
 
 include_directories(modeltest)
 
 add_library(libmodeltest STATIC
             modeltest/modeltest.cpp
 )
 
 target_link_libraries(libmodeltest
                       PRIVATE
                       Qt5::Core
                       Qt5::Test
 )
 
 # -------------------------------------------------------------------------------
 # Unit-tests and CLI tools
 
 add_subdirectory(advancedrename)
 add_subdirectory(albummodel)                    # Unit-test based on ModelTest
 add_subdirectory(database)                      # Some unit-tests based on ModelTest
 add_subdirectory(dialogs)
 add_subdirectory(dimg)
 add_subdirectory(dngwriter)
 add_subdirectory(dplugins)
 add_subdirectory(facesengine)
 add_subdirectory(fileio)
 add_subdirectory(filters)
 add_subdirectory(geolocation)                   # Some unit-tests based on ModelTest
 add_subdirectory(imgqsort)
 add_subdirectory(iojobs)
 add_subdirectory(mediaserver)
 add_subdirectory(mediawiki)
 add_subdirectory(metadataengine)
 add_subdirectory(multithreading)
 add_subdirectory(panorama)
 add_subdirectory(rawengine)
 add_subdirectory(timestampupdate)
 add_subdirectory(webservices)
 
 add_subdirectory(widgets)
 
 if(ENABLE_MEDIAPLAYER)
     add_subdirectory(video)
 endif()