Skip to content

Commit 9cd7145

Browse files
committed
chore(cmake): egl headers in cmake
1 parent 0226b1d commit 9cd7145

File tree

6 files changed

+1693
-11
lines changed

6 files changed

+1693
-11
lines changed

CMakeLists.txt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,22 @@ FetchContent_Declare(Eigen3
5050
GIT_PROGRESS TRUE
5151
EXCLUDE_FROM_ALL
5252
)
53+
FetchContent_Declare(
54+
egl_headers
55+
GIT_REPOSITORY https://github.com/KhronosGroup/EGL-Registry.git
56+
GIT_TAG main
57+
GIT_SHALLOW TRUE
58+
)
59+
FetchContent_Declare(
60+
opengl_registry
61+
GIT_REPOSITORY https://github.com/KhronosGroup/OpenGL-Registry.git
62+
GIT_TAG main
63+
GIT_SHALLOW TRUE
64+
)
5365

54-
55-
FetchContent_MakeAvailable(pybind11 Eigen3)
66+
FetchContent_MakeAvailable(pybind11 Eigen3 egl_headers opengl_registry)
5667
include(compile_scenes)
68+
# egl headers
69+
include_directories(${egl_headers_SOURCE_DIR}/api)
5770

5871
add_subdirectory(src)

debian_deps.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
build-essential
22
gcc
3-
ninja
4-
cmake
53
libpoco-dev
64
libglfw3-dev
75
libconsole-bridge-dev

extensions/rcs_fr3/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
3535
# turn off libfranka tests
3636
set(BUILD_TESTS OFF)
3737
set(BUILD_EXAMPLES OFF)
38-
set(RL_BUILD_DEMOS OFF)
39-
set(RL_BUILD_RL_SG OFF)
40-
set(RL_BUILD_TESTS OFF)
41-
set(RL_BUILD_EXTRAS OFF)
4238
set(BUILD_PYTHON_INTERFACE OFF)
4339
set(BUILD_DOCUMENTATION OFF)
4440

@@ -72,6 +68,7 @@ FetchContent_Declare(Eigen3
7268
EXCLUDE_FROM_ALL
7369
)
7470

75-
FetchContent_MakeAvailable(libfranka pybind11 Eigen3)
71+
FetchContent_MakeAvailable(Eigen3)
72+
FetchContent_MakeAvailable(libfranka pybind11)
7673

7774
add_subdirectory(src)

src/sim/camera.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
#include <math.h>
55

6+
#include <Eigen/Eigen>
67
#include <algorithm>
78
#include <cstdlib>
89
#include <cstring>
9-
#include <Eigen/Eigen>
1010
#include <memory>
1111
#include <set>
1212
#include <stdexcept>

src/sim/sim.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "sim/sim.h"
22

3-
#include <GLFW/glfw3.h>
43
#include <assert.h>
54

65
#include <chrono>

0 commit comments

Comments
 (0)