Skip to content

Commit

Permalink
restore qt patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ericLemanissier committed Jan 8, 2024
1 parent 6debf07 commit df6e71b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
3 changes: 3 additions & 0 deletions recipes/opencv/4.x/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ patches:
- patch_file: "patches/4.5.5-0003-find-quirc.patch"
patch_description: "Robust discovery & injection of quirc"
patch_type: "conan"
- patch_file: "patches/4.8.1-0004-link-qt-targets.patch"
patch_description: "Link to Qt through CMake targets"
patch_type: "conan"
- patch_file: "patches/4.8.1-0001-find-ade.patch"
patch_description: "Robust discovery & injection of ade"
patch_type: "conan"
Expand Down
22 changes: 22 additions & 0 deletions recipes/opencv/4.x/patches/4.8.1-0004-link-qt-targets.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--- a/contrib/modules/cvv/CMakeLists.txt
+++ b/contrib/modules/cvv/CMakeLists.txt
@@ -18,7 +18,7 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
foreach(module ${CVV_QT_MODULES})
- list(APPEND CVV_LIBRARIES ${Qt${QT_VERSION_MAJOR}${module}_LIBRARIES})
+ list(APPEND CVV_LIBRARIES Qt${QT_VERSION_MAJOR}::${module})
endforeach()

ocv_glob_module_sources()
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -116,7 +116,7 @@ if(HAVE_QT)
foreach(dt_dep ${qt_deps})
add_definitions(${Qt${QT_VERSION_MAJOR}${dt_dep}_DEFINITIONS})
include_directories(${Qt${QT_VERSION_MAJOR}${dt_dep}_INCLUDE_DIRS})
- list(APPEND HIGHGUI_LIBRARIES ${Qt${QT_VERSION_MAJOR}${dt_dep}_LIBRARIES})
+ list(APPEND HIGHGUI_LIBRARIES Qt${QT_VERSION_MAJOR}::${dt_dep})
endforeach()
else()
ocv_assert(QT_VERSION_MAJOR EQUAL 4)

0 comments on commit df6e71b

Please sign in to comment.