From d8747021ccf6bdf94d82387913a75c85cc13161e Mon Sep 17 00:00:00 2001 From: chooyy Date: Tue, 18 Nov 2025 14:02:10 +0800 Subject: [PATCH 1/2] g2o: update to 2024.12.28 --- packages/g/g2o/xmake.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/g/g2o/xmake.lua b/packages/g/g2o/xmake.lua index 1e9f0cbbf15..7b6c19baf0f 100644 --- a/packages/g/g2o/xmake.lua +++ b/packages/g/g2o/xmake.lua @@ -7,8 +7,9 @@ package("g2o") end}) add_urls("https://github.com/RainerKuemmerle/g2o.git") add_versions("2020.12.23", "20af80edf8fd237e29bd21859b8fc734e615680e8838824e8b3f120c5f4c1672") + add_versions("2024.12.28", "d691ead69184ebbb8256c9cd9f4121d1a880b169370efc0554dd31a64802a452") - add_deps("cmake", "eigen") + add_deps("cmake", "eigen <5.0") on_install("linux", "windows", "macosx", function (package) local configs = {"-DG2O_BUILD_APPS=OFF", "-DG2O_BUILD_EXAMPLES=OFF"} @@ -28,5 +29,5 @@ package("g2o") g2o::SparseOptimizer optimizer; optimizer.setVerbose(false); } - ]]}, {configs = {languages = "c++14"}})) + ]]}, {configs = {languages = package:version():ge("2023.08.06") and "c++17" or "c++14"}})) end) From ccab04303466a7cf51db2343e8d8a092234c391d Mon Sep 17 00:00:00 2001 From: chooyy Date: Tue, 18 Nov 2025 15:51:43 +0800 Subject: [PATCH 2/2] fix link order --- packages/g/g2o/xmake.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/g/g2o/xmake.lua b/packages/g/g2o/xmake.lua index 7b6c19baf0f..556ff1cc6e3 100644 --- a/packages/g/g2o/xmake.lua +++ b/packages/g/g2o/xmake.lua @@ -11,6 +11,8 @@ package("g2o") add_deps("cmake", "eigen <5.0") + add_links("g2o_solver_slam2d_linear", "g2o_solver_structure_only", "g2o_solver_dense", "g2o_solver_eigen", "g2o_solver_pcg", "g2o_types_data", "g2o_types_icp", "g2o_types_sim3", "g2o_types_sba", "g2o_types_sclam2d", "g2o_types_slam2d_addons", "g2o_types_slam2d", "g2o_types_slam3d_addons", "g2o_types_slam3d", "g2o_core", "g2o_stuff", "g2o_opengl_helper", "g2o_ext_freeglut_minimal") + on_install("linux", "windows", "macosx", function (package) local configs = {"-DG2O_BUILD_APPS=OFF", "-DG2O_BUILD_EXAMPLES=OFF"} table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))