diff options
Diffstat (limited to 'ports/openmvg')
| -rw-r--r-- | ports/openmvg/CONTROL | 4 | ||||
| -rw-r--r-- | ports/openmvg/fixcmake.patch | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL index 5006dc8dd..90c10f3cd 100644 --- a/ports/openmvg/CONTROL +++ b/ports/openmvg/CONTROL @@ -1,7 +1,7 @@ Source: openmvg -Version: 1.4-2 +Version: 1.4-4 Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. -Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib +Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib, suitesparse Feature: opencv Build-Depends: opencv[contrib] diff --git a/ports/openmvg/fixcmake.patch b/ports/openmvg/fixcmake.patch index 66eff4fd3..2dd5201ec 100644 --- a/ports/openmvg/fixcmake.patch +++ b/ports/openmvg/fixcmake.patch @@ -1,5 +1,5 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 654bebd..5264bfc 100644 +index 654bebd..ab7dd90 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,27 +17,16 @@ endif() @@ -110,7 +110,7 @@ index 654bebd..5264bfc 100644 -else() - set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) -endif() -+find_package(eigen3 REQUIRED) ++find_package(Eigen3 REQUIRED) +set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) # ============================================================================== @@ -218,11 +218,11 @@ index 654bebd..5264bfc 100644 - ${PROJECT_BINARY_DIR}/third_party/lemon) - set(LEMON_LIBRARY openMVG_lemon) -endif() -+find_package(Lemon REQUIRED) ++find_package(LEMON REQUIRED) # ============================================================================== # OpenCV -@@ -369,12 +270,7 @@ endif() +@@ -369,14 +270,13 @@ endif() # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON # ============================================================================== if (OpenMVG_USE_OPENCV) @@ -235,8 +235,14 @@ index 654bebd..5264bfc 100644 + find_package( OpenCV REQUIRED ) endif() ++# ============================================================================== ++# Suitesparse ++# ============================================================================== ++find_package(suitesparse REQUIRED) -@@ -469,67 +365,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) + # ============================================================================== + # Third-party libraries: +@@ -469,67 +369,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) message("\n") |