Skip to content

[OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets #20422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicole mazzuca (strega-nil-ms) merged 3 commits into from
Oct 7, 2021
Merged

[OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets #20422

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1c1e29
[OpenMVS] restore deprecated cmake scripts
cenit Sep 29, 2021
4728dd1
[OpenMVS] fix references
cenit Sep 29, 2021
422c893
switch back to vcpkg_cmake_*
strega-nil Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ports/openmvs/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake")
file(REMOVE "${SOURCE_PATH}/build/Modules/FindCGAL.cmake")
file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake")

vcpkg_cmake_configure(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
GENERATOR Ninja
PREFER_NINJA
OPTIONS ${FEATURE_OPTIONS}
-DOpenMVS_USE_NONFREE=ON
-DOpenMVS_USE_CERES=OFF
Expand All @@ -39,11 +39,11 @@ vcpkg_cmake_configure(
-DOpenMVS_BUILD_TOOLS=OFF
)

vcpkg_cmake_install()
vcpkg_install_cmake()

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}")
Expand Down
9 changes: 1 addition & 8 deletions ports/openmvs/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -27,14 +28,6 @@
},
"tiff",
"vcglib",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
],
"features": {
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4862,7 +4862,7 @@
},
"openmvs": {
"baseline": "1.1.1",
"port-version": 0
"port-version": 1
},
"openni2": {
"baseline": "2.2.0.33",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/openmvs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "054882d44e2b35b2301b634dacc410bb3c48665f",
"version": "1.1.1",
"port-version": 1
},
{
"git-tree": "cda3b971b05a5519ef36759d8f3f49045fa6445e",
"version": "1.1.1",
Expand Down