diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f21066..4a9c277 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,14 +47,14 @@ message("Found nanopb of version: " ${NANOPB_VERSION}) # try to find FRIClient version file(READ ${CMAKE_CURRENT_BINARY_DIR}/${FRIClient_SDK_NAME}/include/friClientIf.h FRI_CLIENT_IF_HEADER) -string(REGEX MATCH "\\version {([0-9]*).([0-9]*)}" _ ${FRI_CLIENT_IF_HEADER}) +string(REGEX MATCH "version \\{([0-9]+)\\.([0-9]+)" _ ${FRI_CLIENT_IF_HEADER}) set(FRICLIENT_VERSION_MAJOR ${CMAKE_MATCH_1}) set(FRICLIENT_VERSION_MINOR ${CMAKE_MATCH_2}) set(FRICLIENT_VERSION ${FRICLIENT_VERSION_MAJOR}.${FRICLIENT_VERSION_MINOR}) if (NOT FRICLIENT_VERSION STREQUAL "1.11") - message(FATAL_ERROR "Expected FRIClient ersion 1.11, found: " ${FRICLIENT_VERSION}) + message(FATAL_ERROR "Expected FRIClient version 1.11, found: " ${FRICLIENT_VERSION}) endif() message("Found FRIClient of version: " ${FRICLIENT_VERSION}) diff --git a/README.md b/README.md index acc3378..b9a8727 100644 --- a/README.md +++ b/README.md @@ -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.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 To build, run diff --git a/package.xml b/package.xml new file mode 100644 index 0000000..074c953 --- /dev/null +++ b/package.xml @@ -0,0 +1,19 @@ + + + + fri_client_sdk + 2.0.0 + CMake support for KUKA's FRI. + bowangFromMars + fredRocs + liver121888 + peterMitrano + mhubii + OmidRezayof + + Apache-2.0 + + + cmake + + \ No newline at end of file