diff --git a/ports/colmap/fix-flann.patch b/ports/colmap/fix-flann.patch new file mode 100644 index 00000000000000..af8685a39aa1c3 --- /dev/null +++ b/ports/colmap/fix-flann.patch @@ -0,0 +1,44 @@ +diff --git a/cmake/FindDependencies.cmake b/cmake/FindDependencies.cmake +index 9e33c7e..f640c77 100644 +--- a/cmake/FindDependencies.cmake ++++ b/cmake/FindDependencies.cmake +@@ -17,7 +17,12 @@ find_package(Eigen3 ${COLMAP_FIND_TYPE}) + + find_package(FreeImage ${COLMAP_FIND_TYPE}) + +-find_package(FLANN ${COLMAP_FIND_TYPE}) ++find_package(flann CONFIG ${COLMAP_FIND_TYPE}) ++if(BUILD_SHARED_LIBS ) ++ set(FLANN_LIB flann::flann) ++else() ++ set(FLANN_LIB flann::flann_s) ++endif() + find_package(LZ4 ${COLMAP_FIND_TYPE}) + + find_package(Metis ${COLMAP_FIND_TYPE}) +diff --git a/src/colmap/feature/CMakeLists.txt b/src/colmap/feature/CMakeLists.txt +index c5da882..478ee6d 100644 +--- a/src/colmap/feature/CMakeLists.txt ++++ b/src/colmap/feature/CMakeLists.txt +@@ -66,7 +66,7 @@ COLMAP_ADD_LIBRARY( + colmap_sensor + colmap_vlfeat + Eigen3::Eigen +- flann ++ ${FLANN_LIB} + lz4 + ) + if(GPU_ENABLED) +diff --git a/src/colmap/retrieval/CMakeLists.txt b/src/colmap/retrieval/CMakeLists.txt +index 903a935..93363b3 100644 +--- a/src/colmap/retrieval/CMakeLists.txt ++++ b/src/colmap/retrieval/CMakeLists.txt +@@ -43,7 +43,7 @@ COLMAP_ADD_LIBRARY( + PUBLIC_LINK_LIBS + Boost::boost + Eigen3::Eigen +- flann ++ ${FLANN_LIB} + lz4 + PRIVATE_LINK_LIBS + colmap_math diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index e9c2e866e158e6..aa477b935e2990 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES no-glu.diff + fix-flann.patch ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index fc77c2de6a7ce9..d9ef5bda4eb4c4 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "colmap", "version": "3.11.1", - "port-version": 2, + "port-version": 3, "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", diff --git a/ports/flann/fix-build-error.patch b/ports/flann/fix-build-error.patch deleted file mode 100644 index 5b5530eb0d73f3..00000000000000 --- a/ports/flann/fix-build-error.patch +++ /dev/null @@ -1,278 +0,0 @@ -From c111a280591aa542914ca845c0be6099a94315ad Mon Sep 17 00:00:00 2001 -From: Lars Glud -Date: Tue, 16 Mar 2021 10:40:06 +0100 -Subject: [PATCH] fix build error - ---- - CMakeLists.txt | 8 ++- - cmake/Config.cmake.in | 5 ++ - src/cpp/CMakeLists.txt | 149 ++++++++++++++++++++++++----------------- - 3 files changed, 96 insertions(+), 66 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4b94d2..33b2c26 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 2.8.12) - - if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -@@ -49,6 +49,8 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) - # set output path for tests - set(TEST_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/test) - -+option(BUILD_SHARED_LIBS "Build shared version of libs" ON) -+option(WITH_HDF5 "Build hdf5 library" OFF) - option(BUILD_C_BINDINGS "Build C bindings" ON) - option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON) - option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON) -@@ -146,8 +148,9 @@ if (BUILD_CUDA_LIB) - endif(CUDA_FOUND) - endif(BUILD_CUDA_LIB) - --find_package(PkgConfig REQUIRED) --pkg_check_modules(LZ4 REQUIRED liblz4) -+find_package(PkgConfig) -+find_package(lz4 CONFIG REQUIRED) -+set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} liblz4") - - #set the C/C++ include path to the "include" directory - include_directories(BEFORE ${PROJECT_SOURCE_DIR}/src/cpp) -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -index 6b95a71..e8bb3f7 100644 ---- a/cmake/Config.cmake.in -+++ b/cmake/Config.cmake.in -@@ -1,5 +1,11 @@ - @PACKAGE_INIT@ - -+# Get definition of 'find_dependency' macro -+include(CMakeFindDependencyMacro) -+# Find lz4. This will create 'lz4::lz4' target -+find_dependency(lz4) -+@CMAKE_EXTERNAL_DEPS@ -+ - include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") - check_required_components("flann") - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index b421abb..474cd7e 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -8,13 +8,7 @@ file(GLOB_RECURSE C_SOURCES flann.cpp) - file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp) - file(GLOB_RECURSE CU_SOURCES *.cu) - --add_library(flann_cpp_s STATIC ${CPP_SOURCES}) --target_link_libraries(flann_cpp_s ${LZ4_LIBRARIES}) --if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) -- set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC) --endif() --set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA) -- -+#Set flags if we build CUDA versions - if (BUILD_CUDA_LIB) - SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA") - if(CMAKE_COMPILER_IS_GNUCC) -@@ -25,75 +19,93 @@ if (BUILD_CUDA_LIB) - else() - set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};" ) - endif() -- cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES}) -- set_property(TARGET flann_cuda_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) - endif() - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann_cpp SHARED "") -- set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) -- target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) -+if(NOT BUILD_SHARED_LIBS) -+ add_library(flann_cpp_s STATIC ${CPP_SOURCES}) -+ target_link_libraries(flann_cpp_s PUBLIC lz4::lz4) -+ set_property(TARGET flann_cpp_s PROPERTY OUTPUT_NAME flann_cpp) -+ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) -+ set_target_properties(flann_cpp_s PROPERTIES COMPILE_FLAGS -fPIC) -+ endif() -+ -+ if (BUILD_CUDA_LIB) -+ cuda_add_library(flann_cuda_s STATIC ${CU_SOURCES}) -+ target_link_libraries(flann_cuda_s lz4::lz4) -+ set_property(TARGET flann_cuda_s PROPERTY OUTPUT_NAME flann_cuda) -+ set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA) -+ endif() -+endif() - -- if (BUILD_CUDA_LIB) -- cuda_add_library(flann_cuda SHARED "") -+if(BUILD_SHARED_LIBS) -+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -+ add_library(flann_cpp SHARED ${CPP_SOURCES}) -+ set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) -+ target_link_libraries(flann_cpp PUBLIC lz4::lz4) -+ if (BUILD_CUDA_LIB) -+ cuda_add_library(flann_cuda SHARED ${CU_SOURCES}) - set_target_properties(flann_cuda PROPERTIES LINKER_LANGUAGE CXX) -- target_link_libraries(flann_cuda -Wl,-whole-archive flann_cuda_s -Wl,-no-whole-archive) -- set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) -- # target_link_libraries(flann_cuda cudpp_x86_64) -- endif() --else() -- add_library(flann_cpp SHARED ${CPP_SOURCES}) -- target_link_libraries(flann_cpp -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) -- # export lz4 headers, so that MSVC to creates flann_cpp.lib -- set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) -- if (BUILD_CUDA_LIB) -- cuda_add_library(flann_cuda SHARED ${CPP_SOURCES}) - set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) -- endif() --endif() -- --set_target_properties(flann_cpp PROPERTIES -- VERSION ${FLANN_VERSION} -- SOVERSION ${FLANN_SOVERSION} -- DEFINE_SYMBOL FLANN_EXPORTS --) -- --if (BUILD_CUDA_LIB) -- set_target_properties(flann_cuda PROPERTIES -- VERSION ${FLANN_VERSION} -- SOVERSION ${FLANN_SOVERSION} -- DEFINE_SYMBOL FLANN_EXPORTS -- ) -+ endif() -+ else() -+ add_library(flann_cpp SHARED ${CPP_SOURCES}) -+ target_link_libraries(flann_cpp PUBLIC lz4::lz4) -+ # export lz4 headers, so that MSVC to creates flann_cpp.lib -+ set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) -+ if (BUILD_CUDA_LIB) -+ cuda_add_library(flann_cuda SHARED ${CU_SOURCES}) -+ target_link_libraries(flann_cuda lz4::lz4) -+ set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) -+ endif() -+ endif() -+ -+ set_target_properties(flann_cpp PROPERTIES -+ VERSION ${FLANN_VERSION} -+ SOVERSION ${FLANN_SOVERSION} -+ DEFINE_SYMBOL FLANN_EXPORTS -+ ) -+ -+ if (BUILD_CUDA_LIB) -+ set_target_properties(flann_cuda PROPERTIES -+ VERSION ${FLANN_VERSION} -+ SOVERSION ${FLANN_SOVERSION} -+ DEFINE_SYMBOL FLANN_EXPORTS -+ ) -+ endif() - endif() - -- - if (USE_MPI AND HDF5_IS_PARALLEL) -- add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) -- target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) -+ if(BUILD_SHARED_LIBS) -+ add_executable(flann_mpi_server flann/mpi/flann_mpi_server.cpp) -+ target_link_libraries(flann_mpi_server flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) - -- add_executable(flann_mpi_client flann/mpi/flann_mpi_client.cpp) -- target_link_libraries(flann_mpi_client flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) -+ add_executable(flann_mpi_client flann/mpi/flann_mpi_client.cpp) -+ target_link_libraries(flann_mpi_client flann_cpp ${HDF5_LIBRARIES} ${MPI_LIBRARIES} ${Boost_LIBRARIES}) - -- install (TARGETS flann_mpi_client flann_mpi_server -- DESTINATION bin) -+ install (TARGETS flann_mpi_client flann_mpi_server -+ DESTINATION bin) -+ endif() - endif() - -- - if (BUILD_C_BINDINGS) -+ if(NOT BUILD_SHARED_LIBS) - add_library(flann_s STATIC ${C_SOURCES}) -- target_link_libraries(flann_s -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) -+ target_link_libraries(flann_s PUBLIC lz4::lz4) -+ set_property(TARGET flann_s PROPERTY OUTPUT_NAME flann) - if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) - set_target_properties(flann_s PROPERTIES COMPILE_FLAGS -fPIC) - endif() - set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) -- -+ endif() -+ -+ if(BUILD_SHARED_LIBS) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann SHARED "") -+ add_library(flann SHARED ${C_SOURCES}) -+ target_link_libraries(flann PUBLIC lz4::lz4) - set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) -- target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) - else() - add_library(flann SHARED ${C_SOURCES}) -- target_link_libraries(flann -Wl,--push-state,--no-as-needed ${LZ4_LIBRARIES} -Wl,--pop-state) -+ target_link_libraries(flann PUBLIC lz4::lz4) - - if(MINGW AND OPENMP_FOUND) - target_link_libraries(flann gomp) -@@ -105,20 +117,31 @@ if (BUILD_C_BINDINGS) - SOVERSION ${FLANN_SOVERSION} - DEFINE_SYMBOL FLANN_EXPORTS - ) -+ endif() - endif() - - if(WIN32) --if (BUILD_C_BINDINGS AND BUILD_MATLAB_BINDINGS) -- install ( -- TARGETS flann -- RUNTIME DESTINATION share/flann/matlab -- ) --endif() -+ if (BUILD_C_BINDINGS AND BUILD_MATLAB_BINDINGS) -+ install ( -+ TARGETS flann -+ RUNTIME DESTINATION share/flann/matlab -+ ) -+ endif() - endif(WIN32) - -+if(NOT BUILD_SHARED_LIBS) -+ list(APPEND FLANN_TARGETS_CPP "flann_cpp_s") -+ list(APPEND FLANN_TARGETS_C "flann_s") -+ list(APPEND FLANN_TARGETS_CUDA "flann_cuda_s") -+endif() -+if(BUILD_SHARED_LIBS) -+ list(APPEND FLANN_TARGETS_CPP "flann_cpp") -+ list(APPEND FLANN_TARGETS_C "flann") -+ list(APPEND FLANN_TARGETS_CUDA "flann_cuda") -+endif() - - install ( -- TARGETS flann_cpp flann_cpp_s -+ TARGETS ${FLANN_TARGETS_CPP} - EXPORT ${targets_export_name} - INCLUDES DESTINATION include - RUNTIME DESTINATION bin -@@ -128,7 +151,7 @@ install ( - - if (BUILD_CUDA_LIB) - install ( -- TARGETS flann_cuda flann_cuda_s -+ TARGETS ${FLANN_TARGETS_CUDA} - EXPORT ${targets_export_name} - INCLUDES DESTINATION include - RUNTIME DESTINATION bin -@@ -139,7 +162,7 @@ endif() - - if (BUILD_C_BINDINGS) - install ( -- TARGETS flann flann_s -+ TARGETS ${FLANN_TARGETS_C} - EXPORT ${targets_export_name} - INCLUDES DESTINATION include - RUNTIME DESTINATION bin --- -2.29.2.windows.2 - diff --git a/ports/flann/fix-dep-lz4.patch b/ports/flann/fix-dep-lz4.patch new file mode 100644 index 00000000000000..fb951ed52a53a7 --- /dev/null +++ b/ports/flann/fix-dep-lz4.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5fd73ba..ff357f2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,8 +155,8 @@ if (BUILD_CUDA_LIB) + endif(CUDA_FOUND) + endif(BUILD_CUDA_LIB) + +-find_package(PkgConfig REQUIRED) +-pkg_check_modules(LZ4 REQUIRED liblz4) ++find_package(lz4 CONFIG REQUIRED) ++set(LZ4_LINK_LIBRARIES lz4::lz4) + include_directories(${LZ4_INCLUDE_DIRS}) + + #set the C/C++ include path to the "include" directory +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 6b95a71..d78c74a 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -1,5 +1,10 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(lz4 CONFIG) ++if(@WITH_HDF5@) ++ find_dependency(HDF5 CONFIG) ++endif() + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") + check_required_components("flann") + +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index 7603abc..cb31f6f 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -24,7 +24,9 @@ target_link_libraries(flann_cpp ${LZ4_LINK_LIBRARIES}) + # export lz4 headers, so that MSVC to creates flann_cpp.lib + set_target_properties(flann_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS YES) + +-set(flann_install_targets flann_cpp) ++if (NOT CMAKE_BUILD_STATIC_LIBS) ++ set(flann_install_targets flann_cpp) ++endif() + + if (BUILD_CUDA_LIB) + SET(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS};-DFLANN_USE_CUDA;-Xcudafe \"--diag_suppress=partial_override\" ;-gencode=arch=compute_52,code=\"sm_52,compute_52\";-gencode=arch=compute_61,code=\"sm_61,compute_61\"") +@@ -45,9 +47,12 @@ if (BUILD_CUDA_LIB) + endif() + + cuda_add_library(flann_cuda SHARED ${CU_SOURCES}) +- list(APPEND flann_install_targets flann_cuda) +- set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) ++ if (NOT CMAKE_BUILD_STATIC_LIBS) ++ list(APPEND flann_install_targets flann_cuda) ++ set_property(TARGET flann_cpp PROPERTY COMPILE_DEFINITIONS FLANN_USE_CUDA) ++ endif() + set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC FLANN_USE_CUDA) ++ + else() + set_property(TARGET flann_cpp_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) + endif() +@@ -94,8 +99,9 @@ if (BUILD_C_BINDINGS) + + add_library(flann SHARED ${C_SOURCES}) + target_link_libraries(flann ${LZ4_LINK_LIBRARIES}) +- list(APPEND flann_install_targets flann) +- ++ if (NOT CMAKE_BUILD_STATIC_LIBS) ++ list(APPEND flann_install_targets flann) ++ endif() + if(MINGW AND OPENMP_FOUND) + target_link_libraries(flann gomp) + endif() diff --git a/ports/flann/fix_undefined_pot_t.patch b/ports/flann/fix_undefined_pot_t.patch deleted file mode 100644 index 459727e0b926b0..00000000000000 --- a/ports/flann/fix_undefined_pot_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cpp/flann/algorithms/dist.h b/src/cpp/flann/algorithms/dist.h -index 4e6eb73..bbcdda1 100644 ---- a/src/cpp/flann/algorithms/dist.h -+++ b/src/cpp/flann/algorithms/dist.h -@@ -519,7 +519,7 @@ struct HammingPopcnt - #else - HammingLUT lut; - result = lut(reinterpret_cast (a), -- reinterpret_cast (b), size * sizeof(pop_t)); -+ reinterpret_cast (b), size); - #endif - return result; - } diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 8eb96a4b5a0f68..ad84dc03e75232 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -3,13 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO flann-lib/flann - REF 1d04523268c388dabf1c0865d69e1b638c8c7d9d - SHA512 61e322222c2daa0b9677095e5ca231cba7c305ce754ad8e659eee350111c1e04351181c3af04e45ab6e5c9edea49c7b9ec6499bb0dbc080b87af36eb11c6ef7c + REF f9caaf609d8b8cb2b7104a85cf59eb92c275a25d + SHA512 14cd7d3249109ce66c43258f8b9d158efa3b57f654708e76751290eba25e2cb7fc8044a1d882c6b24d0cda1a8b206709acdb5338086ca1f2d60fef35f0fa85be HEAD_REF master PATCHES - fix-build-error.patch fix-dependency-hdf5.patch - fix_undefined_pot_t.patch # https://github.com/opencv/opencv/pull/13270/ + fix-dep-lz4.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -17,6 +16,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS hdf5 WITH_HDF5 cuda BUILD_CUDA_LIB ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(LINK_STATIC ON) +else() + set(LINK_STATIC OFF) +endif() vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} @@ -28,6 +32,7 @@ vcpkg_cmake_configure( -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF -DUSE_OPENMP=OFF + -DCMAKE_BUILD_STATIC_LIBS=${LINK_STATIC} OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) @@ -36,7 +41,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - # Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/flann/vcpkg.json b/ports/flann/vcpkg.json index c93f374d020fb9..f5bcef3d900ac1 100644 --- a/ports/flann/vcpkg.json +++ b/ports/flann/vcpkg.json @@ -1,7 +1,6 @@ { "name": "flann", - "version-date": "2019-04-07", - "port-version": 7, + "version-date": "2022-10-28", "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d0e0e6f29043ad..31ef06e54fb2be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1802,7 +1802,7 @@ }, "colmap": { "baseline": "3.11.1", - "port-version": 2 + "port-version": 3 }, "color-console": { "baseline": "2022-03-20", @@ -2793,8 +2793,8 @@ "port-version": 0 }, "flann": { - "baseline": "2019-04-07", - "port-version": 7 + "baseline": "2022-10-28", + "port-version": 0 }, "flash-runtime-extensions": { "baseline": "2.4", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 94eca6b5aa8ba6..8ba4fb59619cee 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d6a3ce7dca6d76ac205a89d5426af7a0935f24a", + "version": "3.11.1", + "port-version": 3 + }, { "git-tree": "7deee951326bf2685951c8d5ff7cbc3618ec5567", "version": "3.11.1", diff --git a/versions/f-/flann.json b/versions/f-/flann.json index 94e299066fe60b..74b294a4322e95 100644 --- a/versions/f-/flann.json +++ b/versions/f-/flann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7273f30ac55bb5b6839308111462929473a1f220", + "version-date": "2022-10-28", + "port-version": 0 + }, { "git-tree": "827bba7345ec924adeee28bacb5b0a79f705920d", "version-date": "2019-04-07",