[OpenMVS] restore deprecated cmake scripts for configure, build & fix…

…up targets (#20422) * [OpenMVS] restore deprecated cmake scripts * [OpenMVS] fix references * switch back to vcpkg_cmake_* Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
microsoft · Oct 7, 2021 · b1e54e8 · b1e54e8
1 parent 15af003
commit b1e54e8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake
@@ -23,7 +23,6 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake")
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    GENERATOR Ninja
     OPTIONS ${FEATURE_OPTIONS}
         -DOpenMVS_USE_NONFREE=ON
         -DOpenMVS_USE_CERES=OFF
@@ -43,7 +42,7 @@ vcpkg_cmake_install()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-vcpkg_cmake_config_fixup()
+vcpkg_fixup_cmake_targets()
 file(READ ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake TARGETS_CMAKE)
 string(REPLACE "bin/InterfaceCOLMAP" "tools/openmvs/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}")
 string(REPLACE "bin/InterfaceVisualSFM" "tools/openmvs/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}")

diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openmvs",
   "version": "1.1.1",
+  "port-version": 1,
   "description": "OpenMVS: open Multi-View Stereo reconstruction library",
   "homepage": "https://cdcseacave.github.io/openMVS",
   "dependencies": [
@@ -31,10 +32,6 @@
       "name": "vcpkg-cmake",
       "host": true
     },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    },
     "zlib"
   ],
   "features": {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4874,7 +4874,7 @@
     },
     "openmvs": {
       "baseline": "1.1.1",
-      "port-version": 0
+      "port-version": 1
     },
     "openni2": {
       "baseline": "2.2.0.33",

diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "168233263a9b959a9a19f1eb2d6f462d5257d18f",
+      "version": "1.1.1",
+      "port-version": 1
+    },
     {
       "git-tree": "cda3b971b05a5519ef36759d8f3f49045fa6445e",
       "version": "1.1.1",