From fbbe5f6005e7eaabbf54108a86a24291839ffb04 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:15:41 +0100
Subject: [PATCH] [Openmvg] single config build fixes (#42732)

---
 ports/openmvg/portfile.cmake | 6 ++++--
 ports/openmvg/vcpkg.json     | 1 +
 versions/baseline.json       | 2 +-
 versions/o-/openmvg.json     | 5 +++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake
index e1067ff4fa..5b3b32f1d0 100644
--- a/ports/openmvg/portfile.cmake
+++ b/ports/openmvg/portfile.cmake
@@ -78,8 +78,10 @@ vcpkg_cmake_install()
 
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/openMVG/")
 file(RENAME "${CURRENT_PACKAGES_DIR}/lib/openMVG/cmake" "${CURRENT_PACKAGES_DIR}/share/openMVG/cmake")
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/")
-file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG/cmake" "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/cmake")
+if(NOT VCPKG_BUILD_TYPE)
+  file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/")
+  file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/openMVG/cmake" "${CURRENT_PACKAGES_DIR}/debug/share/openMVG/cmake")
+endif()
 
 vcpkg_cmake_config_fixup()
 
diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json
index ce69a4cd4b..e7405bc6e7 100644
--- a/ports/openmvg/vcpkg.json
+++ b/ports/openmvg/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openmvg",
   "version": "2.1",
+  "port-version": 1,
   "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
   "license": "MPL-2.0-no-copyleft-exception",
   "supports": "(x86 | x64 | arm64) & !xbox",
diff --git a/versions/baseline.json b/versions/baseline.json
index fa1561806a..19dc422fa7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6734,7 +6734,7 @@
     },
     "openmvg": {
       "baseline": "2.1",
-      "port-version": 0
+      "port-version": 1
     },
     "openmvs": {
       "baseline": "2.1.0",
diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json
index a2a3d17848..9942a25fc2 100644
--- a/versions/o-/openmvg.json
+++ b/versions/o-/openmvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "004bc9d5fa217b3e1f94c62f850107d47ff7427b",
+      "version": "2.1",
+      "port-version": 1
+    },
     {
       "git-tree": "897ab1ecaccba02608f2a36ebc8072548aa6c395",
       "version": "2.1",