From fd7d7670a13078b985c570813e7e46c6b7f1feb7 Mon Sep 17 00:00:00 2001 From: mhubii Date: Fri, 23 Feb 2024 15:23:05 +0000 Subject: [PATCH 1/2] add version header https://github.com/lbr-stack/lbr_fri_ros2_stack/issues/156 --- CMakeLists.txt | 5 +++++ friVersion.h.in | 7 +++++++ 2 files changed, 12 insertions(+) create mode 100644 friVersion.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index f9e7467..18900c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ################################# diff --git a/friVersion.h.in b/friVersion.h.in new file mode 100644 index 0000000..a8e0de3 --- /dev/null +++ b/friVersion.h.in @@ -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 From 584b340c319fddd03a8bf06fbb51c4e257424dd0 Mon Sep 17 00:00:00 2001 From: mhubii Date: Fri, 23 Feb 2024 15:26:33 +0000 Subject: [PATCH 2/2] added build table --- .gitignore | 3 ++- README.md | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d9dbb88..90d6b03 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ ### build -build \ No newline at end of file +build +install diff --git a/README.md b/README.md index 22b5a1e..1c73b9d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,14 @@ # fri -[![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) - 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