Skip to content

Commit afd0af8

Browse files
Merge remote-tracking branch 'origin/master' into pymem
2 parents 9d6cea4 + faca4c3 commit afd0af8

4 files changed

Lines changed: 10 additions & 545 deletions

File tree

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ repos:
1111

1212
# C++
1313
- repo: https://github.com/pre-commit/mirrors-clang-format
14-
rev: v21.1.0
14+
rev: v21.1.2
1515
hooks:
1616
- id: clang-format
1717
types_or: [c++, c, cuda]
1818

1919
# python
2020
- repo: https://github.com/pycqa/isort
21-
rev: 6.0.1
21+
rev: 7.0.0
2222
hooks:
2323
- id: isort
24-
- repo: https://github.com/psf/black
25-
rev: 25.1.0
24+
- repo: https://github.com/psf/black-pre-commit-mirror
25+
rev: 25.9.0
2626
hooks:
2727
- id: black

CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ endif()
107107

108108
# For building the CHOLMOD based solvers
109109
option(G2O_USE_CHOLMOD "Build g2o with CHOLMOD support" ON)
110-
find_package(SuiteSparse)
111-
if (G2O_USE_CHOLMOD AND SuiteSparse_CHOLMOD_FOUND)
110+
find_package(CHOLMOD)
111+
if (G2O_USE_CHOLMOD AND TARGET SuiteSparse::CHOLMOD)
112112
message(STATUS "Enable support for Cholmod")
113113
set(CHOLMOD_FOUND TRUE)
114114
else()
@@ -435,7 +435,9 @@ endif(MSVC)
435435
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${g2o_CXX_FLAGS}")
436436
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${g2o_C_FLAGS}")
437437

438-
find_package(Eigen3 3.3 REQUIRED)
438+
# Find Eigen3
439+
# See https://eigen.tuxfamily.org/dox/TopicCMakeGuide.html for details
440+
find_package(Eigen3 REQUIRED NO_MODULE)
439441
find_package(nlohmann_json 3.3.0)
440442

441443
# Generate config.h

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ following packages.
106106
- spdlog <https://github.com/gabime/spdlog>
107107
- suitesparse <http://faculty.cse.tamu.edu/davis/suitesparse.html>
108108
- Qt5 <http://qt-project.org>
109-
- libQGLViewer <http://www.libqglviewer.com>
109+
- libQGLViewer <https://gillesdebunne.github.io/libQGLViewer/>
110110
- JSON for Modern C++ <https://github.com/nlohmann/json>
111111

112112
On Ubuntu / Debian these dependencies are resolved by installing the

0 commit comments

Comments
 (0)