From ec06445e9867cc71c7a967e7a43c2da53b1691a6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:31:34 +0100 Subject: [PATCH] [opencv4] no absolute paths (#28203) --- ports/opencv4/portfile.cmake | 2 +- ports/opencv4/usage.in | 4 ++-- ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index a856935d44..9f82e1f6f0 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -577,7 +577,7 @@ endif() vcpkg_fixup_pkgconfig() -configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") +configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) file(GLOB extra_license_files "${CURRENT_PACKAGES_DIR}/share/licenses/opencv4/*") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" ${extra_license_files}) diff --git a/ports/opencv4/usage.in b/ports/opencv4/usage.in index cb9c47dc75..3c0346ab7a 100644 --- a/ports/opencv4/usage.in +++ b/ports/opencv4/usage.in @@ -1,5 +1,5 @@ -If you do not install the meta-port *opencv*, the package ${PORT} is compatible with CMake +If you do not install the meta-port *opencv*, the package @PORT@ is compatible with CMake if you set the OpenCV_DIR *before* the find_package call - set(OpenCV_DIR "${CURRENT_INSTALLED_DIR}/share/${PORT}") + set(OpenCV_DIR "${VCPKG_INSTALLED_DIR}/@TARGET_TRIPLET@/share/@PORT@") find_package(OpenCV REQUIRED) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index f606e69fc0..982756e551 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.6.0", - "port-version": 9, + "port-version": 10, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6a38281577..c4dab220bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5482,7 +5482,7 @@ }, "opencv4": { "baseline": "4.6.0", - "port-version": 9 + "port-version": 10 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index ee3b2a8943..1ccda2115d 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ddfc66a3d38c96fbe831242cdd1148d54cbca87", + "version": "4.6.0", + "port-version": 10 + }, { "git-tree": "3fcb51fbbc3605e41bcdbd0ea0acd6233127b49b", "version": "4.6.0",