Skip to content

Commit

Permalink
Merge branch 'fri-1.15' into fri-2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mhubii committed Feb 23, 2024
2 parents fedc1ad + 584b340 commit d107aa3
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
### build
build
build
install
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ endif()

message("Found FRIClient of version: " ${FRICLIENT_VERSION})

# create version header
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/friVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/${FRIClient_SDK_NAME}/include/friVersion.h
)

#################################
# define FRIClient library target
#################################
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# fri
[![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)

This folder adds CMake support to KUKA's Fast Robot Interface (FRI).

| FRI Version | Build Status |
| ----------- | ------------ |
| `1.11` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.11)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
| `1.14` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.14)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) |
| `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) |

## Build
To build, run

Expand Down
7 changes: 7 additions & 0 deletions friVersion.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#ifndef FRI_VERSION_H
#define FRI_VERSION_H

#define FRICLIENT_VERSION_MAJOR @FRICLIENT_VERSION_MAJOR@
#define FRICLIENT_VERSION_MINOR @FRICLIENT_VERSION_MINOR@

#endif // FRI_VERSION_H

0 comments on commit d107aa3

Please sign in to comment.