aboutsummaryrefslogtreecommitdiff
path: root/ports/openmvs
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-09-27 10:41:02 -0700
committerCurtis J Bezault <curtbezault@gmail.com>2019-09-27 10:41:02 -0700
commit9433136b22b5e443d550ca7665a562637c8a86b9 (patch)
treebf29de1962d1810f52e1d8537734ad3def9ea52d /ports/openmvs
parent50b49af28a7ab619b341f3ba20d47592d302baab (diff)
downloadvcpkg-9433136b22b5e443d550ca7665a562637c8a86b9.tar.gz
vcpkg-9433136b22b5e443d550ca7665a562637c8a86b9.zip
[boost] Update to 1.71.0 (#7959)
* [boost] Update to 1.71.0 * [openmvs] Fixes for boost 1.71 * [telnetpp] DISABLE_PARALLEL_CONFIGURE * [execute_process] Fix output variables (like error_code) not getting populated * [telnetpp] Add missing boost-exception dependency * [boost] Refactor generate-ports.ps1 into scripts dir. Enable boost-thread on uwp. * [boost-iostreams] Revert removal of zstd dependency * [openmvs] Fix tools deployment
Diffstat (limited to 'ports/openmvs')
-rw-r--r--ports/openmvs/CONTROL2
-rw-r--r--ports/openmvs/boost-1.71.patch13
-rw-r--r--ports/openmvs/portfile.cmake53
3 files changed, 26 insertions, 42 deletions
diff --git a/ports/openmvs/CONTROL b/ports/openmvs/CONTROL
index 6cbbe4119..8efa8ff0a 100644
--- a/ports/openmvs/CONTROL
+++ b/ports/openmvs/CONTROL
@@ -1,4 +1,4 @@
Source: openmvs
-Version: 1.0-1
+Version: 1.0-2
Description: OpenMVS: open Multi-View Stereo reconstruction library
Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, ceres, opencv, cgal[core], glew, glfw3, vcglib
diff --git a/ports/openmvs/boost-1.71.patch b/ports/openmvs/boost-1.71.patch
new file mode 100644
index 000000000..9f3ff50a7
--- /dev/null
+++ b/ports/openmvs/boost-1.71.patch
@@ -0,0 +1,13 @@
+diff --git a/libs/Common/Types.h b/libs/Common/Types.h
+index aad57d1..ef21380 100644
+--- a/libs/Common/Types.h
++++ b/libs/Common/Types.h
+@@ -88,7 +88,7 @@
+ #define BOOST_NO_EXCEPTIONS
+ #endif
+ #ifdef BOOST_NO_EXCEPTIONS
+-namespace boost { void throw_exception(std::exception const&); }
++#include <boost/throw_exception.hpp>
+ #endif
+ #define BOOST_NO_UNREACHABLE_RETURN_DETECTION
+ // include headers that implement serialization support
diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake
index 97f789383..6eb30f6f8 100644
--- a/ports/openmvs/portfile.cmake
+++ b/ports/openmvs/portfile.cmake
@@ -10,59 +10,30 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
glfw3_target_compat.patch
+ boost-1.71.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ -DOpenMVS_USE_BREAKPAD=OFF
+ -DOpenMVS_USE_CUDA=OFF
+ -DINSTALL_CMAKE_DIR:STRING=share/openmvs
+ -DINSTALL_BIN_DIR:STRING=bin
+ -DINSTALL_LIB_DIR:STRING=lib
+ -DINSTALL_INCLUDE_DIR:STRING=include
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
-else()
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/CMake/OpenMVS)
-endif()
+vcpkg_fixup_cmake_targets()
-#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
-if(CMAKE_HOST_WIN32)
-set(EXECUTABLE_SUFFIX ".exe")
-else()
-set(EXECUTABLE_SUFFIX "")
-endif()
-
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX})
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX})
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openmvs/)
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX}")
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/DensifyPointCloud${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/DensifyPointCloud${EXECUTABLE_SUFFIX})
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX}")
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceCOLMAP${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceCOLMAP${EXECUTABLE_SUFFIX})
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX}")
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/InterfaceVisualSFM${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/InterfaceVisualSFM${EXECUTABLE_SUFFIX})
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX}")
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/ReconstructMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/ReconstructMesh${EXECUTABLE_SUFFIX})
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX}")
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/RefineMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/RefineMesh${EXECUTABLE_SUFFIX})
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX}")
- file(RENAME ${CURRENT_PACKAGES_DIR}/bin/OpenMVS/TextureMesh${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openmvs/TextureMesh${EXECUTABLE_SUFFIX})
-endif()
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/openmvs)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openmvs)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvs RENAME copyright)