Skip to content

Commit 3bbf124

Browse files
authored
Merge pull request #250 from RobotControlStack/juelg/bump-libfranka
bump: libfranka to 0.20.3 version
2 parents e44af5b + 0a7210d commit 3bbf124

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

debian_deps.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ gcc
33
libpoco-dev
44
libeigen3-dev
55
libglfw3-dev
6+
libconsole-bridge-dev
7+
libtinyxml2-dev

extensions/rcs_fr3/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,14 @@ find_package(rcs REQUIRED)
5151

5252
FetchContent_Declare(
5353
libfranka
54-
GIT_REPOSITORY https://github.com/frankaemika/libfranka.git
55-
GIT_TAG 0.15.0
54+
GIT_REPOSITORY https://github.com/frankarobotics/libfranka.git
55+
GIT_TAG 0.20.3
5656
GIT_PROGRESS TRUE
5757
EXCLUDE_FROM_ALL
58+
# Overwrite the version check script with our dummy script
59+
PATCH_COMMAND ${CMAKE_COMMAND} -E copy
60+
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/SetVersionFromGit.cmake"
61+
"cmake/SetVersionFromGit.cmake"
5862
)
5963
FetchContent_Declare(pybind11
6064
GIT_REPOSITORY https://github.com/pybind/pybind11.git
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# This replaces the original libfranka function to bypass git errors
2+
function(set_version_from_git VERSION_VAR TAG_VAR)
3+
set(${VERSION_VAR} "" PARENT_SCOPE)
4+
set(${TAG_VAR} "" PARENT_SCOPE)
5+
message(STATUS "Patched libfranka to bypass git check")
6+
endfunction()

0 commit comments

Comments
 (0)