[opencv3] no absolute paths (#28179)

microsoft · Dec 8, 2022 · 4e0bdbc · 4e0bdbc
1 parent 35619c2
commit 4e0bdbc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "876eb437a419de1c4b052aa706aff9c4fea5210c",
+      "version": "3.4.18",
+      "port-version": 5
+    },
     {
       "git-tree": "9ba33f70606fe9df685c72eae8884204f582d9af",
       "version": "3.4.18",