Skip to content

Enable to compile with libfranka 0.14.1 #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pazeshun wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Enable to compile with libfranka 0.14.1 #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions franka_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ find_package(catkin REQUIRED COMPONENTS
std_srvs
)

find_package(Franka 0.9.0 QUIET)
find_package(Franka 0.14.1 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
find_package(Franka 0.9.0 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
endif()
endif()

# merge Franka + catkin INCLUDE_DIRS in topological order
Expand Down
7 changes: 5 additions & 2 deletions franka_example_controllers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@ find_package(catkin REQUIRED COMPONENTS
)

find_package(Eigen3 REQUIRED)
find_package(Franka 0.9.0 QUIET)
find_package(Franka 0.14.1 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
find_package(Franka 0.9.0 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
endif()
endif()

# merge Franka + INCLUDE_DIRS in topological order
Expand Down
7 changes: 5 additions & 2 deletions franka_gripper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ find_package(catkin REQUIRED COMPONENTS
actionlib_msgs
)

find_package(Franka 0.9.0 QUIET)
find_package(Franka 0.14.1 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
find_package(Franka 0.9.0 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
endif()
endif()

# merge Franka + catkin INCLUDE_DIRS in topological order
Expand Down
7 changes: 5 additions & 2 deletions franka_hw/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ find_package(catkin REQUIRED COMPONENTS
message_generation
)

find_package(Franka 0.9.0 QUIET)
find_package(Franka 0.14.1 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
find_package(Franka 0.9.0 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
endif()
endif()

# merge Franka + catkin INCLUDE_DIRS in topological order
Expand Down
7 changes: 5 additions & 2 deletions franka_visualization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ find_package(catkin REQUIRED COMPONENTS
roscpp
)

find_package(Franka 0.9.0 QUIET)
find_package(Franka 0.14.1 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
find_package(Franka 0.9.0 QUIET)
if(NOT Franka_FOUND)
find_package(Franka 0.8.0 REQUIRED)
endif()
endif()

# merge Franka + catkin INCLUDE_DIRS in topological order
Expand Down