diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-29 04:23:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 19:23:57 -0800 |
| commit | eb044d1eb5250a79c94c86f6157e034627f7628b (patch) | |
| tree | 591c88640d8ee5ef61f1d3e417db9b639651e7b0 /ports/opencv4/0010-fix-interface_link_libraries.patch | |
| parent | 2eece71f53de6f9a83d2b686b8adceb40100a134 (diff) | |
| download | vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.tar.gz vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.zip | |
[OpenCV] bump to 4.5.1 and to 3.4.13 (#15859)
* [OpenCV] bump to 4.5.1 and to 3.4.13
* [OpenCV] fix patches
* [OpenCV] fix hdf5 integration
* [OpenCV] devendor quirc
* fix quirc for downstream ports
* [quirc] fix target export
* update version refs
* [OpenMVG] fix regressions with new opencv
* update version refs
* fix quirc mismatch
* update version refs
Diffstat (limited to 'ports/opencv4/0010-fix-interface_link_libraries.patch')
| -rw-r--r-- | ports/opencv4/0010-fix-interface_link_libraries.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/ports/opencv4/0010-fix-interface_link_libraries.patch b/ports/opencv4/0010-fix-interface_link_libraries.patch deleted file mode 100644 index 647518313..000000000 --- a/ports/opencv4/0010-fix-interface_link_libraries.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/modules/videoio/cmake/init.cmake b/modules/videoio/cmake/init.cmake -index 1efef12..81d5d9f 100644 ---- a/modules/videoio/cmake/init.cmake -+++ b/modules/videoio/cmake/init.cmake -@@ -12,8 +12,16 @@ function(ocv_add_external_target name inc link def) - set_target_properties(ocv.3rdparty.${name} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${inc}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${inc}" -- INTERFACE_LINK_LIBRARIES "${link}" - INTERFACE_COMPILE_DEFINITIONS "${def}") -+ # When cmake version is greater than or equal to 3.11, INTERFACE_LINK_LIBRARIES no longer applies to interface library -+ # See https://github.com/opencv/opencv/pull/18658 -+ if (CMAKE_VERSION VERSION_LESS 3.11) -+ set_target_properties(ocv.3rdparty.${name} PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${link}") -+ else() -+ target_link_libraries(ocv.3rdparty.${name} INTERFACE ${link}) -+ endif() -+ # - if(NOT BUILD_SHARED_LIBS) - install(TARGETS ocv.3rdparty.${name} EXPORT OpenCVModules) - endif() |