Skip to content

Commit 0226b1d

Browse files
juelgjuelg
committed
chore: eigen as fetchcontentdeclare
1 parent f606690 commit 0226b1d

14 files changed

Lines changed: 60 additions & 27 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
3333

3434
include(FetchContent)
3535

36-
find_package(Eigen3 REQUIRED)
37-
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
36+
find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
3837
find_package(MuJoCo REQUIRED)
3938
find_package(pinocchio REQUIRED)
4039

@@ -45,8 +44,15 @@ FetchContent_Declare(pybind11
4544
GIT_PROGRESS TRUE
4645
EXCLUDE_FROM_ALL
4746
)
47+
FetchContent_Declare(Eigen3
48+
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
49+
GIT_TAG 3.4.1
50+
GIT_PROGRESS TRUE
51+
EXCLUDE_FROM_ALL
52+
)
53+
4854

49-
FetchContent_MakeAvailable(pybind11)
55+
FetchContent_MakeAvailable(pybind11 Eigen3)
5056
include(compile_scenes)
5157

5258
add_subdirectory(src)

‎debian_deps.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
build-essential
22
gcc
3+
ninja
4+
cmake
35
libpoco-dev
4-
libeigen3-dev
56
libglfw3-dev
67
libconsole-bridge-dev
78
libtinyxml2-dev

‎extensions/rcs_fr3/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ set(BUILD_DOCUMENTATION OFF)
4444

4545
include(FetchContent)
4646

47-
find_package(Eigen3 REQUIRED)
48-
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
47+
find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
4948
find_package(pinocchio REQUIRED)
5049
find_package(rcs REQUIRED)
5150

@@ -66,7 +65,13 @@ FetchContent_Declare(pybind11
6665
GIT_PROGRESS TRUE
6766
EXCLUDE_FROM_ALL
6867
)
68+
FetchContent_Declare(Eigen3
69+
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
70+
GIT_TAG 3.4.1
71+
GIT_PROGRESS TRUE
72+
EXCLUDE_FROM_ALL
73+
)
6974

70-
FetchContent_MakeAvailable(libfranka pybind11)
75+
FetchContent_MakeAvailable(libfranka pybind11 Eigen3)
7176

7277
add_subdirectory(src)

‎extensions/rcs_panda/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ set(BUILD_DOCUMENTATION OFF)
4444

4545
include(FetchContent)
4646

47-
find_package(Eigen3 REQUIRED)
48-
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
47+
find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
4948
find_package(pinocchio REQUIRED)
5049
find_package(rcs REQUIRED)
5150

@@ -62,8 +61,14 @@ FetchContent_Declare(pybind11
6261
GIT_PROGRESS TRUE
6362
EXCLUDE_FROM_ALL
6463
)
64+
FetchContent_Declare(Eigen3
65+
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
66+
GIT_TAG 3.4.1
67+
GIT_PROGRESS TRUE
68+
EXCLUDE_FROM_ALL
69+
)
6570

66-
FetchContent_MakeAvailable(libfranka pybind11)
71+
FetchContent_MakeAvailable(libfranka pybind11 Eigen3)
6772
set_target_properties(franka PROPERTIES CXX_STANDARD 17)
6873

6974
add_subdirectory(src_fr3)

‎extensions/rcs_robotics_library/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ set(BUILD_DOCUMENTATION OFF)
4141

4242
include(FetchContent)
4343

44-
find_package(Eigen3 REQUIRED)
45-
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
44+
find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
4645
find_package(pinocchio REQUIRED)
4746
find_package(rcs REQUIRED)
4847

@@ -58,7 +57,13 @@ FetchContent_Declare(pybind11
5857
GIT_PROGRESS TRUE
5958
EXCLUDE_FROM_ALL
6059
)
60+
FetchContent_Declare(Eigen3
61+
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
62+
GIT_TAG 3.4.1
63+
GIT_PROGRESS TRUE
64+
EXCLUDE_FROM_ALL
65+
)
6166

62-
FetchContent_MakeAvailable(rl pybind11)
67+
FetchContent_MakeAvailable(rl pybind11 Eigen3)
6368

6469
add_subdirectory(src)

‎extensions/rcs_robotics_library/src/pybind/RL.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <rl/mdl/JacobianInverseKinematics.h>
99
#include <rl/mdl/UrdfFactory.h>
1010

11-
#include <eigen3/Eigen/Eigen>
12-
#include <eigen3/Eigen/Geometry>
11+
#include <Eigen/Eigen>
12+
#include <Eigen/Geometry>
1313
#include <memory>
1414
#include <optional>
1515
#include <string>

‎extensions/rcs_so101/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ set(BUILD_DOCUMENTATION OFF)
4040

4141
include(FetchContent)
4242

43-
find_package(Eigen3 REQUIRED)
44-
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
43+
find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
4544
find_package(pinocchio REQUIRED)
4645
find_package(rcs REQUIRED)
4746

@@ -51,6 +50,12 @@ FetchContent_Declare(pybind11
5150
GIT_PROGRESS TRUE
5251
EXCLUDE_FROM_ALL
5352
)
54-
FetchContent_MakeAvailable(pybind11)
53+
FetchContent_Declare(Eigen3
54+
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
55+
GIT_TAG 3.4.1
56+
GIT_PROGRESS TRUE
57+
EXCLUDE_FROM_ALL
58+
)
59+
FetchContent_MakeAvailable(pybind11 Eigen3)
5560

5661
add_subdirectory(src)

‎extensions/rcs_so101/src/pybind/SO101.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#include <rcs/Pose.h>
66
#include <rcs/utils.h>
77

8-
#include <eigen3/Eigen/Eigen>
9-
#include <eigen3/Eigen/Geometry>
8+
#include <Eigen/Eigen>
9+
#include <Eigen/Geometry>
1010
#include <memory>
1111
#include <optional>
1212
#include <pinocchio/algorithm/frames.hpp>

‎include/rcs/Kinematics.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef RCS_IK_H
22
#define RCS_IK_H
33

4-
#include <eigen3/Eigen/Eigen>
5-
#include <eigen3/Eigen/Geometry>
4+
#include <Eigen/Eigen>
5+
#include <Eigen/Geometry>
66
#include <memory>
77
#include <optional>
88
#include <string>

‎include/rcs/Pose.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#ifndef RCS_POSE_H
22
#define RCS_POSE_H
33

4-
#include <eigen3/Eigen/Eigen>
5-
#include <eigen3/Eigen/Geometry>
4+
#include <Eigen/Eigen>
5+
#include <Eigen/Geometry>
66
#include <memory>
77

88
#include "utils.h"

0 commit comments

Comments
 (0)