[opencv3/opencv4] Check whether TARGET libprotobuf is defined (micros…

…oft#36116) * fix opencv3 * update version * fix opencv4 * format * update version * add comment * update git-tree --------- Co-authored-by: Monica <[email protected]>
m-kuhn · Jan 16, 2024 · a215c6a · a215c6a
1 parent a14456f
commit a215c6a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
@@ -420,7 +420,7 @@ endif()
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
   file(READ "${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules.cmake" OPENCV_MODULES)
   set(DEPS_STRING "include(CMakeFindDependencyMacro)
-if(${BUILD_opencv_flann})
+if(${BUILD_opencv_flann} AND NOT TARGET libprotobuf) #Check if the CMake target libprotobuf is already defined
   find_dependency(Protobuf CONFIG REQUIRED)
   if(TARGET protobuf::libprotobuf)
     add_library (libprotobuf INTERFACE IMPORTED)
@@ -538,4 +538,4 @@ endif()
 
 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)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.18",
-  "port-version": 12,
+  "port-version": 13,
   "description": "Open Source Computer Vision Library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "BSD-3-Clause",

diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
@@ -490,7 +490,7 @@ endif()
 
   file(READ "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" OPENCV_MODULES)
   set(DEPS_STRING "include(CMakeFindDependencyMacro)
-if(${BUILD_opencv_dnn})
+if(${BUILD_opencv_dnn} AND NOT TARGET libprotobuf)  #Check if the CMake target libprotobuf is already defined
   find_dependency(Protobuf CONFIG REQUIRED)
   if(TARGET protobuf::libprotobuf)
     add_library (libprotobuf INTERFACE IMPORTED)

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

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6274,11 +6274,11 @@
     },
     "opencv3": {
       "baseline": "3.4.18",
-      "port-version": 12
+      "port-version": 13
     },
     "opencv4": {
       "baseline": "4.8.0",
-      "port-version": 14
+      "port-version": 15
     },
     "opendnp3": {
       "baseline": "3.1.1",

diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "577dd8933e58290664f4290476069978692ed4f2",
+      "version": "3.4.18",
+      "port-version": 13
+    },
     {
       "git-tree": "f5ee69ffa1b6c98a28fc805afffaeb799b4d22a8",
       "version": "3.4.18",

diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec4e040d476cee60b2fc21a1f847d30905ac9726",
+      "version": "4.8.0",
+      "port-version": 15
+    },
     {
       "git-tree": "852583d8f7a5bb15998efad9c0305a8ce686e59b",
       "version": "4.8.0",