Skip to content

FIxed expected version in CMakeLists.txt and added this version to readme #36

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
matija9 wants to merge 3 commits into
base: fri-2.6
Choose a base branch
from
Open

FIxed expected version in CMakeLists.txt and added this version to readme #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
528b13d
Fixed CMake to accept appropriate version of FRI SDK. Version in SDK …
matija9 Feb 3, 2025
1755ff1
Added 2.6 to the version table
matija9 Feb 4, 2025
ad3f952
Update build.yaml for correct branch
matija9 Feb 4, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
pull_request:
branches:
- fri-1.15
- fri-2.6
schedule:
- cron: "0 0 1 * *" # monthly

Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ set(FRI_CLIENT_VERSION_MAJOR ${CMAKE_MATCH_1})
set(FRI_CLIENT_VERSION_MINOR ${CMAKE_MATCH_2})
set(FRI_CLIENT_VERSION ${FRI_CLIENT_VERSION_MAJOR}.${FRI_CLIENT_VERSION_MINOR})

if (NOT FRI_CLIENT_VERSION STREQUAL "1.15")
message(FATAL_ERROR "Expected FRIClient version 1.15, found: " ${FRI_CLIENT_VERSION})
if (NOT FRI_CLIENT_VERSION STREQUAL "2.5")
message(FATAL_ERROR "Expected FRIClient version 2.5, found: " ${FRI_CLIENT_VERSION})
endif()

message("Found FRIClient of version: " ${FRI_CLIENT_VERSION})
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ This folder adds CMake support to KUKA's Fast Robot Interface (FRI).
| `1.15` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.15)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
| `1.16` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.16)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
| `2.5` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-2.5)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
| `2.6` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-2.6)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
| `2.7` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-2.7)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |

## Build
Expand Down