aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2021-10-07 05:57:42 +0200
committerGitHub <noreply@github.com>2021-10-06 20:57:42 -0700
commitb1e54e881bf317f5ce3b58020a8e53a5a4c3ad19 (patch)
tree3c2d92e9798b3a20e3a3782131808d278358b8df /ports
parent15af0031946a4d451c38faa3722812a4a03370b5 (diff)
downloadvcpkg-b1e54e881bf317f5ce3b58020a8e53a5a4c3ad19.tar.gz
vcpkg-b1e54e881bf317f5ce3b58020a8e53a5a4c3ad19.zip
[OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422)
* [OpenMVS] restore deprecated cmake scripts * [OpenMVS] fix references * switch back to vcpkg_cmake_* Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports')
-rw-r--r--ports/openmvs/portfile.cmake3
-rw-r--r--ports/openmvs/vcpkg.json5
2 files changed, 2 insertions, 6 deletions
diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake
index ef4f8eac3..eaf1c4a05 100644
--- 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
index 6e482076c..fa03e4dae 100644
--- 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": {