Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ceres + downstreams] Update to ceres to 2.2.0 #42475

Merged
merged 70 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
19a3b89
[ceres] Update to port version 2.2.0
ahojnnes Dec 2, 2024
41e4fc1
d
ahojnnes Dec 2, 2024
e185abc
d
ahojnnes Dec 2, 2024
73c312a
d
ahojnnes Dec 2, 2024
ba5ccff
d
ahojnnes Dec 3, 2024
7bcc754
d
ahojnnes Dec 3, 2024
14e6951
d
ahojnnes Dec 3, 2024
68bea46
d
ahojnnes Dec 3, 2024
adbc51b
cartographer
ahojnnes Dec 4, 2024
73085c9
d
ahojnnes Dec 4, 2024
732c856
d
ahojnnes Dec 4, 2024
31b6e60
d
ahojnnes Dec 4, 2024
766d336
d
ahojnnes Dec 4, 2024
7d3b7d5
d
ahojnnes Dec 4, 2024
c9242c4
d
ahojnnes Dec 4, 2024
4dd9d75
d
ahojnnes Dec 4, 2024
df13a95
Merge branch 'master' of https://github.com/microsoft/vcpkg into user…
ahojnnes Dec 4, 2024
0256b96
openturns
ahojnnes Dec 4, 2024
823ed58
d
ahojnnes Dec 4, 2024
41dc988
d
ahojnnes Dec 4, 2024
476dacf
d
ahojnnes Dec 4, 2024
e7a4007
d
ahojnnes Dec 4, 2024
343d558
d
ahojnnes Dec 4, 2024
87cc0e3
d
ahojnnes Dec 4, 2024
0d8fbbe
d
ahojnnes Dec 4, 2024
874459b
d
ahojnnes Dec 4, 2024
3e90198
d
ahojnnes Dec 4, 2024
61edee3
d
ahojnnes Dec 4, 2024
3a01806
d
ahojnnes Dec 4, 2024
a1b6112
d
ahojnnes Dec 4, 2024
7663800
d
ahojnnes Dec 4, 2024
7a949a7
d
ahojnnes Dec 4, 2024
b3f4dcd
d
ahojnnes Dec 4, 2024
5d3f0c9
d
ahojnnes Dec 4, 2024
da61845
d
ahojnnes Dec 4, 2024
7066000
d
ahojnnes Dec 4, 2024
7e5f6f7
d
ahojnnes Dec 4, 2024
3451349
d
ahojnnes Dec 5, 2024
abd2334
d
ahojnnes Dec 5, 2024
6d436bc
d
ahojnnes Dec 5, 2024
2cab7a0
d
ahojnnes Dec 5, 2024
a5b3f9a
d
ahojnnes Dec 5, 2024
7c04c60
d
ahojnnes Dec 5, 2024
f85d663
d
ahojnnes Dec 5, 2024
88cbb02
d
ahojnnes Dec 5, 2024
c65ee75
d
ahojnnes Dec 5, 2024
3efe26c
d
ahojnnes Dec 5, 2024
0a52491
d
ahojnnes Dec 5, 2024
3bbe299
d
ahojnnes Dec 5, 2024
8952607
d
ahojnnes Dec 5, 2024
217782b
d
ahojnnes Dec 5, 2024
30a17dc
d
ahojnnes Dec 5, 2024
6e1e657
d
ahojnnes Dec 5, 2024
303130f
d
ahojnnes Dec 6, 2024
91494ff
d
ahojnnes Dec 6, 2024
9b9c7f4
d
ahojnnes Dec 6, 2024
eb518c6
cr
ahojnnes Dec 6, 2024
dacc456
d
ahojnnes Dec 6, 2024
79d503d
fix ceres
ahojnnes Dec 10, 2024
503648f
d
ahojnnes Dec 10, 2024
5bc2afd
fix
ahojnnes Dec 10, 2024
03c42f4
d
ahojnnes Dec 10, 2024
db5a5e9
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 11, 2024
edf9d08
Deindex theia and cartrographer on the grounds that they require huge…
BillyONeal Dec 11, 2024
b5b3e51
Update ports/openmvg/portfile.cmake
ahojnnes Dec 11, 2024
278d047
d
ahojnnes Dec 11, 2024
4301643
d
ahojnnes Dec 11, 2024
c0d750d
Merge branch 'master' of https://github.com/microsoft/vcpkg into user…
ahojnnes Dec 13, 2024
6b564c2
d
ahojnnes Dec 13, 2024
54ea59f
d
ahojnnes Dec 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions ports/cartographer/fix-build-error.patch

This file was deleted.

22 changes: 0 additions & 22 deletions ports/cartographer/fix-cmake-location.patch

This file was deleted.

175 changes: 0 additions & 175 deletions ports/cartographer/fix-find-packages.patch

This file was deleted.

30 changes: 0 additions & 30 deletions ports/cartographer/portfile.cmake

This file was deleted.

30 changes: 0 additions & 30 deletions ports/cartographer/vcpkg.json

This file was deleted.

78 changes: 72 additions & 6 deletions ports/ceres/0001_cmakelists_fixes.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,68 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33e98b1..f275d68 100644
index 8e49c19e..f8c61d92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -426,27 +426,7 @@ if (MINIGLOG)
@@ -292,27 +292,28 @@ if (SUITESPARSE)
# built with SuiteSparse support.

# Check for SuiteSparse and dependencies.
- find_package(SuiteSparse 4.5.6 COMPONENTS CHOLMOD SPQR
- OPTIONAL_COMPONENTS Partition)
- if (SuiteSparse_FOUND)
- set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})")
+ find_package(SuiteSparse REQUIRED CONFIG)
+ if (SUITESPARSE_FOUND)
+ set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION} CONFIG)")
# By default, if all of SuiteSparse's dependencies are found, Ceres is
# built with SuiteSparse support.
message("-- Found SuiteSparse ${SuiteSparse_VERSION}, "
"building with SuiteSparse.")
-
- if (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
- install(FILES ${Ceres_SOURCE_DIR}/cmake/FindSuiteSparse.cmake
- ${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake
- DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
- endif (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR)
- else (SuiteSparse_FOUND)
+ add_library(SuiteSparse::CONFIG ALIAS SuiteSparse::suitesparseconfig)
+ add_library(SuiteSparse::AMD ALIAS SuiteSparse::amd)
+ add_library(SuiteSparse::CAMD ALIAS SuiteSparse::camd)
+ add_library(SuiteSparse::CCOLAMD ALIAS SuiteSparse::ccolamd)
+ add_library(SuiteSparse::COLAMD ALIAS SuiteSparse::colamd)
+ add_library(SuiteSparse::CHOLMOD ALIAS SuiteSparse::cholmod)
+ add_library(SuiteSparse::SPQR ALIAS SuiteSparse::spqr)
+ add_library(METIS::METIS ALIAS metis)
+ else (SUITESPARSE_FOUND)
# Disable use of SuiteSparse if it cannot be found and continue.
message("-- Did not find all SuiteSparse dependencies, disabling "
"SuiteSparse support.")
update_cache_variable(SUITESPARSE OFF)
list(APPEND CERES_COMPILE_OPTIONS CERES_NO_SUITESPARSE)
- endif (SuiteSparse_FOUND)
+ endif (SUITESPARSE_FOUND)
else (SUITESPARSE)
message("-- Building without SuiteSparse.")
list(APPEND CERES_COMPILE_OPTIONS CERES_NO_SUITESPARSE)
@@ -395,9 +396,12 @@ endif()
# GFlags.
if (GFLAGS)
# Don't search with REQUIRED as we can continue without gflags.
- find_package(gflags 2.2.0)
+ find_package(gflags CONFIG REQUIRED)
if (gflags_FOUND)
- if (TARGET gflags)
+ if (TARGET gflags::gflags)
+ if(NOT TARGET gflags)
+ add_library(gflags ALIAS gflags::gflags)
+ endif()
message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}")
else()
message("-- Detected version of gflags: ${gflags_VERSION} does not define "
@@ -430,28 +434,7 @@ if (MINIGLOG)
mark_as_advanced(FORCE GLOG_INCLUDE_DIR
GLOG_LIBRARY)
else (MINIGLOG)
unset(MINIGLOG_MAX_LOG_LEVEL CACHE)
- unset(MINIGLOG_MAX_LOG_LEVEL CACHE)
- # Don't search with REQUIRED so that configuration continues if not found and
- # we can output an error messages explaining MINIGLOG option.
- find_package(Glog)
Expand All @@ -29,9 +86,18 @@ index 33e98b1..f275d68 100644
- message("-- Found Google Log (glog)." ${GLOG_GFLAGS_DEPENDENCY_MESSAGE})
+ find_package(Glog REQUIRED)
endif (MINIGLOG)

if (NOT SCHUR_SPECIALIZATIONS)
@@ -760,12 +740,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
@@ -466,7 +449,7 @@ endif (NOT CUSTOM_BLAS)

if (BUILD_BENCHMARKS)
# Version 1.3 was first to provide import targets
- find_package(benchmark 1.3 QUIET)
+ find_package(benchmark CONFIG REQUIRED)
if (benchmark_FOUND)
message("-- Found Google benchmark library. Building Ceres benchmarks.")
else()
@@ -722,12 +705,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
Expand All @@ -41,6 +107,6 @@ index 33e98b1..f275d68 100644
- install(FILES "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake"
- DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
-endif()

if (PROVIDE_UNINSTALL_TARGET)
# Create an uninstall target to remove all installed files.
Loading