-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6debf07
commit df6e71b
Showing
2 changed files
with
25 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
recipes/opencv/4.x/patches/4.8.1-0004-link-qt-targets.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |