microsoft · vicroms · Aug 27, 2025 · Oct 17, 2023 · Oct 17, 2023 · Aug 12, 2025
diff --git a/ports/chronoengine/find_package_required.patch b/ports/chronoengine/find_package_required.patch
@@ -11,28 +11,6 @@ index 6a8f0f9e1..c44f92eb4 100644
    else()
      find_package(Threads REQUIRED)
    endif()
-diff --git a/cmake/FindEigen3.cmake b/cmake/FindEigen3.cmake
-index 0d2b3cedd..02c2b50d2 100644
---- a/cmake/FindEigen3.cmake
-+++ b/cmake/FindEigen3.cmake
-@@ -1,7 +1,7 @@
- # - Try to find Eigen3 lib
- #
- # This module supports requiring a minimum version, e.g. you can do
--#   find_package(Eigen3 3.1.2)
-+#   find_package(Eigen3 3.1.2 REQUIRED)
- # to require version 3.1.2 or newer of Eigen3.
- #
- # Once done this will define
-@@ -70,7 +70,7 @@ else (EIGEN3_INCLUDE_DIR)
-   # search first if an Eigen3Config.cmake is available in the system,
-   # if successful this would set EIGEN3_INCLUDE_DIR and the rest of
-   # the script will work as usual
--  find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET)
-+  find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE REQUIRED)
-
-   if(NOT EIGEN3_INCLUDE_DIR)
-     find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
 diff --git a/cmake/FindMKL.cmake b/cmake/FindMKL.cmake
 index 6f8a2740f..acf43af4d 100644
 --- a/cmake/FindMKL.cmake

diff --git a/ports/chronoengine/fix_dependencies.patch b/ports/chronoengine/fix_dependencies.patch
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d75ce1055..a21acbd83 100644
+index d75ce1055..11505afe2 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -96,7 +96,7 @@ endif()
@@ -32,16 +32,18 @@ index d75ce1055..a21acbd83 100644
 
     # Set substitution variables for configuration file
     if(SIMD_SSE)
-@@ -250,7 +251,7 @@ endif()
+@@ -250,8 +251,9 @@ endif()
  #-----------------------------------------------------------------------------
 
  message(STATUS "Searching for Eigen3...")
 -find_package(Eigen3 3.3.0)
 +find_package(Eigen3 3.3.0 REQUIRED)
  if(EIGEN3_FOUND)
++  get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
    message(STATUS "  Eigen3 version: ${EIGEN3_VERSION}")
    message(STATUS "  Eigen3 include directory: ${EIGEN3_INCLUDE_DIR}")
-@@ -293,7 +294,9 @@ endif()
+ else()
+@@ -293,7 +295,9 @@ endif()
  #-----------------------------------------------------------------------------
 
  message(STATUS "Searching for MPI...")
@@ -52,7 +54,7 @@ index d75ce1055..a21acbd83 100644
  if(MPI_FOUND)
    message(STATUS "  MPI compiler:      ${MPI_CXX_COMPILER}")
    message(STATUS "  MPI compile flags: ${MPI_CXX_COMPILE_FLAGS}")
-@@ -312,9 +315,9 @@ endif()
+@@ -312,9 +316,9 @@ endif()
  #-----------------------------------------------------------------------------
 
  message(STATUS "Searching for CUDA...")
@@ -65,7 +67,7 @@ index d75ce1055..a21acbd83 100644
  if(CUDA_FOUND)
    set(CUDA_BINARY_DIR "${CUDA_TOOLKIT_ROOT_DIR}/bin")
 
-@@ -373,7 +376,7 @@ endif()
+@@ -373,7 +377,7 @@ endif()
  #-----------------------------------------------------------------------------
 
  message(STATUS "Searching for Thrust...")
@@ -74,7 +76,7 @@ index d75ce1055..a21acbd83 100644
  if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
    find_path(THRUST_INCLUDE_DIR NAMES thrust/version.h PATHS "/usr/local" "/usr/local/include")
    if (THRUST_INCLUDE_DIR)
-@@ -383,9 +386,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+@@ -383,9 +387,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
      set(${THRUST_FOUND} FALSE)
    endif()
  else()
@@ -86,7 +88,7 @@ index d75ce1055..a21acbd83 100644
  if(THRUST_FOUND)
    message(STATUS "  Thrust version:     ${THRUST_VERSION}")
    message(STATUS "  Thrust include dir: ${THRUST_INCLUDE_DIR}")
-@@ -500,14 +503,14 @@ if(ENABLE_HDF5)
+@@ -500,14 +504,14 @@ if(ENABLE_HDF5)
      #    HDF5_INCLUDE_DIRS
      #    HDF5_C_LIBRARIES
      #    HDF5_CXX_LIBRARIES

diff --git a/ports/chronoengine/portfile.cmake b/ports/chronoengine/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
         find_package_required.patch
 )
 
-file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake")
+file(REMOVE 
+    "${SOURCE_PATH}/cmake/FindTBB.cmake"
+    "${SOURCE_PATH}/cmake/FindEigen3.cmake"
+)
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS

diff --git a/ports/chronoengine/vcpkg.json b/ports/chronoengine/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chronoengine",
   "version": "8.0.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Multi-physics Simulation Engine.",
   "homepage": "https://projectchrono.org/",
   "license": "BSD-3-Clause",

diff --git a/ports/g2o/portfile.cmake b/ports/g2o/portfile.cmake
@@ -21,13 +21,13 @@ vcpkg_from_github(
     PATCHES
         dependencies.diff
         fix-absolute.patch
-        remove-FindEigen3.patch
         "${FIX_UPSTREAM_37d17a9}"
         "${FIX_UPSTREAM_100af05}"
 )
 file(REMOVE
     "${SOURCE_PATH}/cmake_modules/FindBLAS.cmake"
     "${SOURCE_PATH}/cmake_modules/FindCSparse.cmake"
+    "${SOURCE_PATH}/cmake_modules/FindEigen3.cmake"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LGPL_SHARED_LIBS)

diff --git a/ports/g2o/remove-FindEigen3.patch b/ports/g2o/remove-FindEigen3.patch
diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch
@@ -1,8 +1,23 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6879c4c..aa4167a 100644
+index 6879c4c6..073190b3 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -324,13 +324,18 @@ else()
+@@ -281,12 +281,13 @@ endif()
+ # - external if EIGEN_INCLUDE_DIR_HINTS is defined
+ # - internal if Eigen not found
+ # ==============================================================================
+-find_package(Eigen3 QUIET)
++find_package(Eigen3 CONFIG REQUIRED)
+ if (NOT Eigen3_FOUND)
+   set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
+   set(OpenMVG_USE_INTERNAL_EIGEN ON)
+   find_package(Eigen QUIET)
+ else()
++  get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
+   set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+ endif()
+ add_definitions(-DEIGEN_MPL2_ONLY)
+@@ -324,13 +325,18 @@ else()
    if (TARGET flann::flann)
      set(FLANN_LIBRARIES "flann::flann;flann::flann_cpp")
    else()
@@ -22,15 +37,15 @@ index 6879c4c..aa4167a 100644
  # ==============================================================================
  # CoinUtils
  # ==============================================================================
-@@ -391,6 +396,7 @@ if (OpenMVG_USE_INTERNAL_OSI AND OpenMVG_USE_INTERNAL_CLP AND OpenMVG_USE_INTERN
+@@ -391,6 +397,7 @@ if (OpenMVG_USE_INTERNAL_OSI AND OpenMVG_USE_INTERNAL_CLP AND OpenMVG_USE_INTERN
    set_property(TARGET lib_Osi PROPERTY FOLDER OpenMVG/3rdParty/lib_Osi)
    set_property(TARGET lib_OsiClpSolver PROPERTY FOLDER OpenMVG/3rdParty/lib_OsiClpSolver)
  endif()
 +endif()
 
  # ==============================================================================
  # Lemon
-@@ -402,7 +408,7 @@ if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS)
+@@ -402,7 +409,7 @@ if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS)
    set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon)
    set(OpenMVG_USE_INTERNAL_LEMON ON)
  endif()

diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openmvg",
   "version": "2.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
   "license": null,
   "supports": "(x86 | x64 | arm64) & !xbox",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1706,7 +1706,7 @@
     },
     "chronoengine": {
       "baseline": "8.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "cialloo-rcon": {
       "baseline": "1.0.0",
@@ -7066,7 +7066,7 @@
     },
     "openmvg": {
       "baseline": "2.1",
-      "port-version": 2
+      "port-version": 3
     },
     "openmvs": {
       "baseline": "2.1.0",

diff --git a/versions/c-/chronoengine.json b/versions/c-/chronoengine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "55389d248b9067f308bcbf81a08d94af3a098976",
+      "version": "8.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "7db5f822e4f4debf9b0b9400a3050fff89dca5c7",
       "version": "8.0.0",

diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "3951452431e71def0ffd69aa9955a8a616d45727",
+      "git-tree": "a66b6e04a733c5678691839e17fc62eeb59aa4cb",
       "version-date": "2024-12-14",
       "port-version": 6
     },

diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "34d65dec331136b85ba9e7ef673c3dedf578424b",
+      "version": "2.1",
+      "port-version": 3
+    },
     {
       "git-tree": "26f65270e3a45107e6e23f45dc8837143d77fb90",
       "version": "2.1",