Skip to content
This repository was archived by the owner on Oct 22, 2025. It is now read-only.

Commit 617b80e

Browse files
teseochzfergus
andauthored
Fix compatibility with latest Eigen (#94)
* Alias Eigen::indexing::all as Eigen::all * Update tight_inclusion and scalable_ccd --------- Co-authored-by: Zachary Ferguson <[email protected]>
1 parent 1638b16 commit 617b80e

File tree

5 files changed

+14
-2
lines changed

5 files changed

+14
-2
lines changed

cmake/recipes/scalable_ccd.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ message(STATUS "Third-party: creating target 'scalable_ccd::scalable_ccd'")
99
set(SCALABLE_CCD_WITH_CUDA ${IPC_TOOLKIT_WITH_CUDA} CACHE BOOL "Enable CUDA CCD" FORCE)
1010

1111
include(CPM)
12-
CPMAddPackage("gh:continuous-collision-detection/scalable-ccd#c03efa095173b44c13d8440bbc859eeaa0ec550b")
12+
CPMAddPackage("gh:continuous-collision-detection/scalable-ccd#60692d7cbc03390a3a198792a3ff2b869c5da05b")

cmake/recipes/tight_inclusion.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ endif()
77
message(STATUS "Third-party: creating target 'tight_inclusion::tight_inclusion'")
88

99
include(CPM)
10-
CPMAddPackage("gh:Continuous-Collision-Detection/[email protected].4")
10+
CPMAddPackage("gh:Continuous-Collision-Detection/[email protected].5")

src/ipc/barrier/adaptive_stiffness.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <ipc/barrier/barrier.hpp>
66

77
#include <algorithm> // std::min/max
8+
#include <cassert>
89

910
namespace ipc {
1011

src/ipc/candidates/candidates.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <ipc/ipc.hpp>
44
#include <ipc/utils/save_obj.hpp>
5+
#include <ipc/utils/eigen_ext.hpp>
56

67
#include <ipc/config.hpp>
78

src/ipc/utils/eigen_ext.hpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include <Eigen/Core>
44
#include <Eigen/SparseCore>
55

6+
#include <cassert>
7+
68
namespace ipc {
79

810
// Boolean scalar
@@ -163,4 +165,12 @@ static const Eigen::IOFormat OBJ_VERTEX_FORMAT = Eigen::IOFormat(
163165

164166
} // namespace ipc
165167

168+
// The current head of the Eigen library moved all into the indexing namespace.
169+
#if EIGEN_VERSION_AT_LEAST(3, 4, 90)
170+
namespace Eigen {
171+
// Move all back to the root namespace for compatibility with older versions
172+
static const Eigen::internal::all_t all = indexing::all;
173+
} // namespace Eigen
174+
#endif
175+
166176
#include "eigen_ext.tpp"

0 commit comments

Comments
 (0)