From 4e0bdbc23acd72cf4b4e72f015f49e86bb252ec6 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Thu, 8 Dec 2022 01:45:34 +0100
Subject: [PATCH] [opencv3] no absolute paths (#28179)

---
 ports/opencv3/portfile.cmake | 2 +-
 ports/opencv3/usage.in       | 4 ++--
 ports/opencv3/vcpkg.json     | 2 +-
 versions/baseline.json       | 2 +-
 versions/o-/opencv3.json     | 5 +++++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index 1724587f9c..851df871bc 100644
--- a/ports/opencv3/portfile.cmake
+++ b/ports/opencv3/portfile.cmake
@@ -525,6 +525,6 @@ 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(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/opencv3/usage.in b/ports/opencv3/usage.in
index 1bec7f3049..0e9e4b3a1d 100644
--- a/ports/opencv3/usage.in
+++ b/ports/opencv3/usage.in
@@ -1,4 +1,4 @@
-The package ${PORT} is compatible with CMake if you set the OpenCV_DIR *before* the find_package call
+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/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
index 5b6dacefa2..171e663530 100644
--- a/ports/opencv3/vcpkg.json
+++ b/ports/opencv3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index af8f16c64d..8ca99b6f98 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5478,7 +5478,7 @@
     },
     "opencv3": {
       "baseline": "3.4.18",
-      "port-version": 4
+      "port-version": 5
     },
     "opencv4": {
       "baseline": "4.6.0",
diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json
index f7293439d2..63f0bdf3c7 100644
--- a/versions/o-/opencv3.json
+++ b/versions/o-/opencv3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "876eb437a419de1c4b052aa706aff9c4fea5210c",
+      "version": "3.4.18",
+      "port-version": 5
+    },
     {
       "git-tree": "9ba33f70606fe9df685c72eae8884204f582d9af",
       "version": "3.4.18",