The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-22 18:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[openmvg] Update to 1.5 (#10008)

Browse Source
This commit is contained in:
Phoebe 2020-02-12 09:23:12 +08:00 committed by GitHub
parent be6d78f1e3
commit dbe299e4a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 427 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/openmvg/CONTROL
View File

@ -1,5 +1,5 @@
Source: openmvg Source: openmvg
Version: 1.4-7 Version: 1.5
Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. 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, suitesparse Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres, cereal, libjpeg-turbo, tiff, libpng, zlib, suitesparse

270
ports/openmvg/fixcmake.patch
View File

@ -1,52 +1,41 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 654bebd..ab7dd90 100644 index 9cfd06c..a4dea06 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -17,27 +17,16 @@ endif() @@ -14,6 +14,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
message(FATAL_ERROR "In-source builds not allowed.")
endif()
+if(0)
# ============================================================================== # ==============================================================================
# OpenMVG build options # OpenMVG build options
# ============================================================================== # ==============================================================================
-option(OpenMVG_BUILD_SHARED "Build OpenMVG shared libs" OFF) @@ -31,7 +32,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON)
-option(OpenMVG_BUILD_TESTS "Build OpenMVG tests" OFF)
-option(OpenMVG_BUILD_DOC "Build OpenMVG documentation" ON)
-option(OpenMVG_BUILD_EXAMPLES "Build OpenMVG samples applications." ON)
-option(OpenMVG_BUILD_OPENGL_EXAMPLES "Build OpenMVG openGL examples" OFF)
-option(OpenMVG_BUILD_SOFTWARES "Build OpenMVG softwares" ON)
-option(OpenMVG_BUILD_GUI_SOFTWARES "Build OpenMVG GUI softwares (QT5)" ON)
-option(OpenMVG_BUILD_COVERAGE "Enable code coverage generation (gcc only)" OFF)
-option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON)
# ==============================================================================
# Opencv is not used by openMVG but some samples show how to use openCV
# and openMVG simultaneously # and openMVG simultaneously
# ============================================================================== # ==============================================================================
-option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF) option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF)
-
+endif()
# ============================================================================== # ==============================================================================
# Since OpenCV 3, SIFT is no longer in the default modules. See # Since OpenCV 3, SIFT is no longer in the default modules. See
# https://github.com/itseez/opencv_contrib for more informations. # https://github.com/itseez/opencv_contrib for more informations.
# Enable this to be able to use OpenCV SIFT in main_ComputeFeatures_OpenCV. @@ -85,6 +86,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# ==============================================================================
-option(OpenMVG_USE_OCVSIFT "Add or not OpenCV SIFT in available features" OFF)
# ==============================================================================
# OpenMVG version
@@ -85,15 +74,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
register_definitions(-DOPENMVG_STD_UNORDERED_MAP) register_definitions(-DOPENMVG_STD_UNORDERED_MAP)
endif() endif()
-# ============================================================================== +if(0)
-# Check that submodule have been initialized and updated # ==============================================================================
-# ============================================================================== # Check that submodule have been initialized and updated
-if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include) # ==============================================================================
- message(FATAL_ERROR @@ -93,6 +95,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
- "\n submodule(s) are missing, please update your repository:\n" "\n submodule(s) are missing, please update your repository:\n"
- " > git submodule update -i\n") " > git submodule update -i\n")
-endif() endif()
- +endif()
# ============================================================================== # ==============================================================================
# Additional cmake find modules # Additional cmake find modules
# ============================================================================== @@ -128,7 +131,6 @@ if (OpenMVG_USE_OPENMP)
@@ -129,7 +109,6 @@ if (OpenMVG_USE_OPENMP)
find_package(OpenMP) find_package(OpenMP)
if (OPENMP_FOUND) if (OPENMP_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
@ -54,7 +43,7 @@ index 654bebd..ab7dd90 100644
register_definitions(-DOPENMVG_USE_OPENMP) register_definitions(-DOPENMVG_USE_OPENMP)
if (NOT MSVC) if (NOT MSVC)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
@@ -140,11 +119,6 @@ if (OpenMVG_USE_OPENMP) @@ -139,11 +141,6 @@ if (OpenMVG_USE_OPENMP)
endif() endif()
endif (NOT MSVC) endif (NOT MSVC)
endif (OPENMP_FOUND) endif (OPENMP_FOUND)
@ -66,163 +55,166 @@ index 654bebd..ab7dd90 100644
endif (OpenMVG_USE_OPENMP) endif (OpenMVG_USE_OPENMP)
# ============================================================================== # ==============================================================================
@@ -183,14 +157,6 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES) @@ -182,6 +179,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw) set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw)
endif (OpenMVG_BUILD_OPENGL_EXAMPLES) endif (OpenMVG_BUILD_OPENGL_EXAMPLES)
-# Dependencies install rules +if(0)
-install( # Dependencies install rules
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/ install(
- DESTINATION include/openMVG_dependencies DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
- COMPONENT headers @@ -189,7 +187,7 @@ install(
- FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" COMPONENT headers
-) FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
)
- -
+endif()
# ============================================================================== # ==============================================================================
# --END-- SUBMODULE CONFIGURATION # --END-- SUBMODULE CONFIGURATION
# ============================================================================== # ==============================================================================
@@ -226,14 +192,8 @@ ENDMACRO(UNIT_TEST) @@ -225,6 +223,7 @@ ENDMACRO(UNIT_TEST)
# - external by default # - external by default
# - internal if cereal not found # - internal if cereal not found
# ============================================================================== # ==============================================================================
-find_package(cereal QUIET CONFIG) +if(0)
-if (NOT cereal_FOUND) find_package(cereal QUIET CONFIG)
- set(CEREAL_INCLUDE_DIRS if (NOT TARGET cereal)
- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/cereal/include) add_library(cereal INTERFACE)
- set(OpenMVG_USE_INTERNAL_CEREAL ON) @@ -237,6 +236,10 @@ if (NOT TARGET cereal)
-else()
- get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) set(OpenMVG_USE_INTERNAL_CEREAL ON)
-endif() endif()
+endif()
+
+find_package(cereal REQUIRED CONFIG) +find_package(cereal REQUIRED CONFIG)
+get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES) +get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES)
# ============================================================================== # ==============================================================================
# Eigen # Eigen
@@ -242,14 +202,8 @@ endif() @@ -245,6 +248,7 @@ endif()
# - external if EIGEN_INCLUDE_DIR_HINTS is defined # - external if EIGEN_INCLUDE_DIR_HINTS is defined
# - internal if Eigen not found # - internal if Eigen not found
# ============================================================================== # ==============================================================================
-find_package(eigen3 QUIET) +if(0)
-if (NOT eigen3_FOUND) find_package(Eigen3 QUIET)
- set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen) if (NOT Eigen3_FOUND)
- set(OpenMVG_USE_INTERNAL_EIGEN ON) set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
- find_package(Eigen QUIET) @@ -253,13 +257,17 @@ if (NOT Eigen3_FOUND)
-else() else()
- set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
-endif() endif()
+endif()
+find_package(Eigen3 REQUIRED) +find_package(Eigen3 REQUIRED)
+set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) +set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
# ============================================================================== # ==============================================================================
# Ceres # Ceres
@@ -257,17 +211,7 @@ endif() # ==============================================================================
# - external by default if CERES_DIR_HINTS or find_package found a valid Ceres # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres
# - internal if ceres not found (ceres-solver+cxsparse+miniglog) # - internal if ceres not found (ceres-solver+cxsparse+miniglog)
# ============================================================================== # ==============================================================================
-find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS}) +if(0)
-if (NOT Ceres_FOUND) find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS})
- set(OpenMVG_USE_INTERNAL_CERES ON) if (NOT Ceres_FOUND)
- set(CERES_INCLUDE_DIRS set(OpenMVG_USE_INTERNAL_CERES ON)
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/include @@ -271,13 +279,16 @@ if (NOT Ceres_FOUND)
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/internal/ceres/miniglog STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG})
- ${PROJECT_BINARY_DIR}/third_party/ceres-solver/config) set(CERES_LIBRARIES openMVG_ceres)
- FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/third_party/ceres-solver/VERSION" CERES_CONFIG) endif()
- STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG}) +endif()
- set(CERES_LIBRARIES openMVG_ceres)
-endif()
+find_package(Ceres REQUIRED)
+find_package(Ceres REQUIRED)
# ============================================================================== # ==============================================================================
# Flann # Flann
@@ -275,14 +219,7 @@ endif() # ==============================================================================
# - internal by default (flann), # - internal by default (flann),
# - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found
# ============================================================================== # ==============================================================================
-if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS) +if(0)
- set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS)
- set(OpenMVG_USE_INTERNAL_FLANN ON) set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
-endif() set(OpenMVG_USE_INTERNAL_FLANN ON)
-find_package(Flann QUIET) @@ -286,13 +297,16 @@ find_package(Flann QUIET)
-if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN) if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN)
- set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp) set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
-endif() endif()
+find_package(flann REQUIRED) +endif()
+find_package(flann REQUIRED)
# ============================================================================== # ==============================================================================
# CoinUtils # CoinUtils
@@ -290,15 +227,7 @@ endif() # ==============================================================================
# - internal by default (CoinUtils), # - internal by default (CoinUtils),
# - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found
# ============================================================================== # ==============================================================================
-if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS) +if(0)
- set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/) if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
- set(OpenMVG_USE_INTERNAL_COINUTILS ON) set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/)
-endif() set(OpenMVG_USE_INTERNAL_COINUTILS ON)
-find_package(CoinUtils QUIET) @@ -302,13 +316,16 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
-if (NOT COINUTILS_FOUND OR OpenMVG_USE_INTERNAL_COINUTILS) else()
- set(COINUTILS_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/) find_package(CoinUtils QUIET)
- set(COINUTILS_LIBRARY lib_CoinUtils) endif()
-endif() +endif()
+find_package(CoinUtils REQUIRED)
+find_package(CoinUtils REQUIRED)
## ============================================================================== ## ==============================================================================
## Clp ## Clp
@@ -306,17 +235,7 @@ endif() ## ==============================================================================
## - internal by default (Clp), ## - internal by default (Clp),
## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found
## ============================================================================== ## ==============================================================================
-if (NOT DEFINED CLP_INCLUDE_DIR_HINTS) +if(0)
- set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/) if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
- set(OpenMVG_USE_INTERNAL_CLP ON) set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/)
-endif() set(OpenMVG_USE_INTERNAL_CLP ON)
-find_package(Clp QUIET) @@ -320,6 +337,9 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
-if (NOT CLP_FOUND OR OpenMVG_USE_INTERNAL_CLP) else()
- set(CLP_INCLUDE_DIRS find_package(Clp QUIET)
- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/ endif()
- ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/OsiClp/) +endif()
- set(CLP_LIBRARIES lib_clp lib_OsiClpSolver) +
-endif()
+find_package(Clp REQUIRED) +find_package(Clp REQUIRED)
# ============================================================================== # ==============================================================================
# Osi # Osi
@@ -324,15 +243,7 @@ endif() @@ -327,6 +347,7 @@ endif()
# - internal by default (Osi), # - internal by default (Osi),
# - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found
# ============================================================================== # ==============================================================================
-if (NOT DEFINED OSI_INCLUDE_DIR_HINTS) +if(0)
- set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/) if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
- set(OpenMVG_USE_INTERNAL_OSI ON) set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/)
-endif() set(OpenMVG_USE_INTERNAL_OSI ON)
-find_package(Osi QUIET) @@ -336,6 +357,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
-if (NOT OSI_FOUND OR OpenMVG_USE_INTERNAL_OSI) else()
- set(OSI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/Osi/) find_package(Osi QUIET)
- set(OSI_LIBRARY lib_Osi) endif()
-endif() +endif()
+
+find_package(Osi REQUIRED) +find_package(Osi REQUIRED)
# ============================================================================== # ==============================================================================
# Internal CLP/OSI/COINUTILS libraries: # Internal CLP/OSI/COINUTILS libraries:
@@ -351,17 +262,7 @@ endif() @@ -354,6 +378,7 @@ endif()
# - internal by default (Lemon), # - internal by default (Lemon),
# - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found
# ============================================================================== # ==============================================================================
-if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS) +if(0)
- set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon) if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS)
- set(OpenMVG_USE_INTERNAL_LEMON ON) set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon)
-endif() set(OpenMVG_USE_INTERNAL_LEMON ON)
-find_package(Lemon QUIET) @@ -365,6 +390,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON)
-if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON) ${PROJECT_BINARY_DIR}/third_party/lemon)
- set(LEMON_INCLUDE_DIRS set(LEMON_LIBRARY openMVG_lemon)
- ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon endif()
- ${PROJECT_BINARY_DIR}/third_party/lemon) +endif()
- set(LEMON_LIBRARY openMVG_lemon) +
-endif()
+find_package(LEMON REQUIRED) +find_package(LEMON REQUIRED)
# ============================================================================== # ==============================================================================
# OpenCV # OpenCV
@@ -369,14 +270,13 @@ endif() @@ -372,15 +400,13 @@ endif()
# - only external and enabled only if OpenMVG_USE_OPENCV is set to ON # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON
# ============================================================================== # ==============================================================================
if (OpenMVG_USE_OPENCV) if (OpenMVG_USE_OPENCV)
@ -235,14 +227,15 @@ index 654bebd..ab7dd90 100644
+ find_package( OpenCV REQUIRED ) + find_package( OpenCV REQUIRED )
endif() endif()
-
+# ============================================================================== +# ==============================================================================
+# Suitesparse +# Suitesparse
+# ============================================================================== +# ==============================================================================
+find_package(suitesparse REQUIRED) +find_package(suitesparse REQUIRED)
# ============================================================================== # ==============================================================================
# Third-party libraries: # Third-party libraries:
@@ -469,67 +369,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT}) # ==============================================================================
@@ -472,67 +498,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT})
message("\n") message("\n")
@ -322,20 +315,21 @@ index 654bebd..ab7dd90 100644
else() else()
message(STATUS "LEMON: " ${LEMON_VERSION} " (external)") message(STATUS "LEMON: " ${LEMON_VERSION} " (external)")
diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake
index c997b87..74c3aae 100644 index 8a69c23..6a81580 100644
--- a/src/cmakeFindModules/FindClp.cmake --- a/src/cmakeFindModules/FindClp.cmake
+++ b/src/cmakeFindModules/FindClp.cmake +++ b/src/cmakeFindModules/FindClp.cmake
@@ -51,8 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "") @@ -51,9 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
SET(CLP_INCLUDE_DIR ${CLP_DIR}) SET(CLP_INCLUDE_DIR ${CLP_DIR})
FIND_LIBRARY(CLP_LIBRARY NAMES Clp) FIND_LIBRARY(CLP_LIBRARY NAMES Clp)
- FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver) - FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver)
- FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp) - FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
-
+ FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp) + FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp)
+ FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp) + FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp)
# locate Clp libraries # locate Clp libraries
IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY) IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY)
SET(CLP_LIBRARIES ${CLP_LIBRARY} ${CLPSOLVER_LIBRARY} ${OSICLP_LIBRARY})
diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt diff --git a/src/openMVG/linearProgramming/CMakeLists.txt b/src/openMVG/linearProgramming/CMakeLists.txt
index cc5212f..acc57dd 100644 index cc5212f..acc57dd 100644
--- a/src/openMVG/linearProgramming/CMakeLists.txt --- a/src/openMVG/linearProgramming/CMakeLists.txt
@ -361,7 +355,7 @@ index cc5212f..acc57dd 100644
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
index 80b1fe6..a091b47 100644 index 5fcd972..b21ea7b 100644
--- a/src/openMVG/matching/CMakeLists.txt --- a/src/openMVG/matching/CMakeLists.txt
+++ b/src/openMVG/matching/CMakeLists.txt +++ b/src/openMVG/matching/CMakeLists.txt
@@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST}) @@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST})
@ -372,9 +366,9 @@ index 80b1fe6..a091b47 100644
set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX) set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX)
add_library(openMVG_matching add_library(openMVG_matching
@@ -38,10 +39,10 @@ target_link_libraries(openMVG_matching @@ -39,10 +40,10 @@ target_link_libraries(openMVG_matching
openMVG_features
Threads::Threads Threads::Threads
cereal
) )
-if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN) -if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
+if (NOT OpenMVG_USE_INTERNAL_FLANN) +if (NOT OpenMVG_USE_INTERNAL_FLANN)

18
ports/openmvg/portfile.cmake
View File

@ -6,8 +6,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO openMVG/openMVG REPO openMVG/openMVG
REF v1.4 REF 606d1c9e82123dd50de282128151a50bf42262fc # v1.5
SHA512 949cf3680375c87b06db0f4713c846422c98d1979d49e9db65761f63f6f3212f0fcd8425f23c6112f04fbbb90b241638c2fd9329bb6b8b612c1d073aac55759a SHA512 eddcf4c5f86541112840a6d89bbf360d30b085c2b3ff3e39b357030a465163b465e89d01474f8dbd65b66f8bccfc1f54a58963324f622482e2960f00214b2b75
PATCHES PATCHES
fixcmake.patch fixcmake.patch
fix-config-cmake.patch fix-config-cmake.patch
@ -15,20 +15,12 @@ vcpkg_from_github(
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
openmp OpenMVG_USE_OPENMP openmp OpenMVG_USE_OPENMP
openmp ENABLE_OPENMP
opencv OpenMVG_USE_OPENCV opencv OpenMVG_USE_OPENCV
opencv OpenMVG_USE_OCVSIFT opencv OpenMVG_USE_OCVSIFT
opencv ENABLE_OPENCV
) )
set(ENABLE_OPENCV OFF)
if("opencv" IN_LIST FEATURES)
set(ENABLE_OPENCV ON)
endif()
set(ENABLE_OPENMP OFF)
if("openmp" IN_LIST FEATURES)
set(ENABLE_OPENMP ON)
endif()
# remove some deps to prevent conflict # remove some deps to prevent conflict
file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver file(REMOVE_RECURSE ${SOURCE_PATH}/src/third_party/ceres-solver
${SOURCE_PATH}/src/third_party/cxsparse ${SOURCE_PATH}/src/third_party/cxsparse
@ -96,4 +88,4 @@ endif()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openmvg RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)