[opencv4,dv-processing] fix pkgconfig (#25621)

microsoft · Jul 20, 2022 · 708ed2b · 708ed2b
1 parent fde0f2c
commit 708ed2b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake
@@ -36,4 +36,10 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME "dv-processing" CONFIG_PATH "share/dv-proc
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+if (VCPKG_TARGET_IS_WINDOWS)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
+else()
+        vcpkg_fixup_pkgconfig()
+endif()
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dv-processing",
   "version": "1.4.0",
+  "port-version": 1,
   "description": "Generic algorithms for event cameras.",
   "homepage": "https://gitlab.com/inivation/dv/dv-processing",
   "license": "Apache-2.0",

diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
@@ -381,6 +381,7 @@ vcpkg_cmake_configure(
         -DOPENCV_DLLVERSION=
         -DOPENCV_DEBUG_POSTFIX=d
         -DOPENCV_GENERATE_SETUPVARS=OFF
+        -DOPENCV_GENERATE_PKGCONFIG=ON
         # Do not build docs/examples
         -DBUILD_DOCS=OFF
         -DBUILD_EXAMPLES=OFF

diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.5.5",
-  "port-version": 5,
+  "port-version": 6,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2006,7 +2006,7 @@
     },
     "dv-processing": {
       "baseline": "1.4.0",
-      "port-version": 0
+      "port-version": 1
     },
     "dx": {
       "baseline": "1.0.1",
@@ -5186,7 +5186,7 @@
     },
     "opencv4": {
       "baseline": "4.5.5",
-      "port-version": 5
+      "port-version": 6
     },
     "opendnp3": {
       "baseline": "3.1.1",

diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d46e8c68fbd834385ac3fa859b35e72cb5bc8648",
+      "version": "1.4.0",
+      "port-version": 1
+    },
     {
       "git-tree": "757cc58887fefa1c48349b91bfaab2e3947b65d9",
       "version": "1.4.0",

diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c929f4a1c447240d07e17d0f105b4a36e3d6b5ce",
+      "version": "4.5.5",
+      "port-version": 6
+    },
     {
       "git-tree": "26f2ba4a582c93442e82167dece932c3833a2124",
       "version": "4.5.5",