[cereal] Update to 1.3.1 (#23114)

* [cereal] Update to 1.3.1

* Update version database

* Fix openMVG build

* Add missing license fields in json

* Update version database

ports/cereal/portfile.cmake

@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO USCiLab/cereal
-    REF v1.3.0
-    SHA512 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72
+    REF v1.3.1
+    SHA512 5beafdd95b16344d5db43a0e26fd670a770e2c2a661ae117c9593db86697ca1034e2bf004fe6dc3c2a690e8a682f60d8b6121211d898009e59361ebef33f6fc9
     HEAD_REF master
 )
 
@@ -16,10 +16,11 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cereal)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cereal)
 
 # Clean
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cereal)

ports/cereal/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "cereal",
-  "version-string": "1.3.0",
-  "port-version": 1,
+  "version": "1.3.1",
   "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)",
-  "homepage": "https://github.com/USCiLab/cereal"
+  "homepage": "https://github.com/USCiLab/cereal",
+  "license": "BSD-3-Clause"
 }

ports/openmvg/build_fixes.patch

@@ -99,7 +99,7 @@ index 5d909ec..ab7eb6f 100644
 +endif()
  
 +find_package(cereal REQUIRED CONFIG)
-+get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES)
++get_target_property(CEREAL_INCLUDE_DIRS cereal::cereal INTERFACE_INCLUDE_DIRECTORIES)
 + 
  # ==============================================================================
  # Eigen
@@ -502,7 +502,7 @@ index cc5212f..acc57dd 100644
      $<INSTALL_INTERFACE:include>
  )
 diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
-index 2e0eafd..be0006f 100644
+index 2e0eafd7..d54d1e88 100644
 --- a/src/openMVG/matching/CMakeLists.txt
 +++ b/src/openMVG/matching/CMakeLists.txt
 @@ -16,6 +16,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST})
@@ -513,9 +513,12 @@ index 2e0eafd..be0006f 100644
  
  set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX)
  add_library(openMVG_matching
-@@ -37,10 +38,10 @@ target_link_libraries(openMVG_matching
+@@ -35,12 +36,12 @@ target_link_libraries(openMVG_matching
+   PUBLIC
+     openMVG_features
      Threads::Threads
-     cereal
+-    cereal
++    cereal::cereal
  )
 -if (NOT DEFINED OpenMVG_USE_INTERNAL_FLANN)
 +if (NOT OpenMVG_USE_INTERNAL_FLANN)
@@ -706,3 +709,55 @@ index 0d61c9f..05c8b29 100644
    #Configure Eigen install
    set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen)
    add_subdirectory(eigen)
+diff --git a/src/openMVG/cameras/CMakeLists.txt b/src/openMVG/cameras/CMakeLists.txt
+index 333ab729..50c8f572 100644
+--- a/src/openMVG/cameras/CMakeLists.txt
++++ b/src/openMVG/cameras/CMakeLists.txt
+@@ -4,7 +4,7 @@ set_property(TARGET openMVG_camera APPEND PROPERTY
+   INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:include>")
+ 
+ target_compile_features(openMVG_camera INTERFACE ${CXX11_FEATURES})
+-target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal ${OPENMVG_LIBRARY_DEPENDENCIES})
++target_link_libraries(openMVG_camera INTERFACE openMVG_numeric cereal::cereal ${OPENMVG_LIBRARY_DEPENDENCIES})
+ install(TARGETS openMVG_camera DESTINATION lib EXPORT openMVG-targets)
+ 
+ UNIT_TEST(openMVG Camera_Pinhole openMVG_camera)
+diff --git a/src/openMVG/features/CMakeLists.txt b/src/openMVG/features/CMakeLists.txt
+index 2e49701d..0b5e1c3d 100644
+--- a/src/openMVG/features/CMakeLists.txt
++++ b/src/openMVG/features/CMakeLists.txt
+@@ -31,7 +31,7 @@ target_include_directories(openMVG_features
+ )
+ target_link_libraries(openMVG_features
+   PRIVATE openMVG_fast ${STLPLUS_LIBRARY}
+-  PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal)
++  PUBLIC ${OPENMVG_LIBRARY_DEPENDENCIES} cereal::cereal)
+ if (MSVC)
+   set_target_properties(openMVG_features PROPERTIES COMPILE_FLAGS "/bigobj")
+   target_compile_options(openMVG_features PUBLIC "-D_USE_MATH_DEFINES")
+diff --git a/src/openMVG/geometry/CMakeLists.txt b/src/openMVG/geometry/CMakeLists.txt
+index 0a6a016a..e509a4d5 100644
+--- a/src/openMVG/geometry/CMakeLists.txt
++++ b/src/openMVG/geometry/CMakeLists.txt
+@@ -21,7 +21,7 @@ set_property(TARGET openMVG_geometry PROPERTY FOLDER OpenMVG/OpenMVG)
+ target_link_libraries(openMVG_geometry
+   PUBLIC
+     openMVG_numeric
+-    cereal
++    cereal::cereal
+   PRIVATE
+     openMVG_linearProgramming
+ )
+diff --git a/src/openMVG/sfm/CMakeLists.txt b/src/openMVG/sfm/CMakeLists.txt
+index b8928083..1d10f939 100644
+--- a/src/openMVG/sfm/CMakeLists.txt
++++ b/src/openMVG/sfm/CMakeLists.txt
+@@ -25,7 +25,7 @@ target_link_libraries(openMVG_sfm
+     openMVG_graph
+     openMVG_matching
+     openMVG_multiview
+-    cereal
++    cereal::cereal
+     ${OPENMVG_LIBRARY_DEPENDENCIES}
+ )
+ 

ports/openmvg/vcpkg.json

@@ -1,8 +1,9 @@
 {
   "name": "openmvg",
   "version": "2.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
+  "license": "MPL-2.0-no-copyleft-exception",
   "dependencies": [
     "cereal",
     {

versions/baseline.json

@@ -1285,8 +1285,8 @@
       "port-version": 2
     },
     "cereal": {
-      "baseline": "1.3.0",
-      "port-version": 1
+      "baseline": "1.3.1",
+      "port-version": 0
     },
     "ceres": {
       "baseline": "2.0.0",
@@ -5058,7 +5058,7 @@
     },
     "openmvg": {
       "baseline": "2.0",
-      "port-version": 1
+      "port-version": 2
     },
     "openmvs": {
       "baseline": "1.1.1",

versions/c-/cereal.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e292069bec2c118568ea23a3db965037a9e38790",
+      "version": "1.3.1",
+      "port-version": 0
+    },
     {
       "git-tree": "7229804bbf716bbefe8052d650fc94687b6dae42",
       "version-string": "1.3.0",

versions/o-/openmvg.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "894793611702efbc0abc44768002cdd12f73557a",
+      "version": "2.0",
+      "port-version": 2
+    },
     {
       "git-tree": "eea9187e35c87676d442453e6942a47417d7c2dd",
       "version": "2.0",