From f6aa7c7218f66c067c4f1eb2cbf1a373d488c8b2 Mon Sep 17 00:00:00 2001 From: mhubii Date: Sat, 7 Sep 2024 12:49:55 +0200 Subject: [PATCH] FRICLIENT_VERSION -> FRI_CLIENT_VERSION --- CMakeLists.txt | 14 +++++++------- friVersion.h.in | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6f2f5d..01d78a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,15 +49,15 @@ message("Found nanopb of version: " ${NANOPB_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}) -set(FRICLIENT_VERSION_MAJOR ${CMAKE_MATCH_1}) -set(FRICLIENT_VERSION_MINOR ${CMAKE_MATCH_2}) -set(FRICLIENT_VERSION ${FRICLIENT_VERSION_MAJOR}.${FRICLIENT_VERSION_MINOR}) +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 FRICLIENT_VERSION STREQUAL "1.15") - message(FATAL_ERROR "Expected FRIClient version 1.15, found: " ${FRICLIENT_VERSION}) +if (NOT FRI_CLIENT_VERSION STREQUAL "1.15") + message(FATAL_ERROR "Expected FRIClient version 1.15, found: " ${FRI_CLIENT_VERSION}) endif() -message("Found FRIClient of version: " ${FRICLIENT_VERSION}) +message("Found FRIClient of version: " ${FRI_CLIENT_VERSION}) # create version header configure_file( @@ -132,7 +132,7 @@ include(CMakePackageConfigHelpers) write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/FRIClientConfigVersion.cmake" - VERSION ${FRICLIENT_VERSION} + VERSION ${FRI_CLIENT_VERSION} COMPATIBILITY SameMajorVersion ) diff --git a/friVersion.h.in b/friVersion.h.in index a8e0de3..da0bad2 100644 --- a/friVersion.h.in +++ b/friVersion.h.in @@ -1,7 +1,7 @@ #ifndef FRI_VERSION_H #define FRI_VERSION_H -#define FRICLIENT_VERSION_MAJOR @FRICLIENT_VERSION_MAJOR@ -#define FRICLIENT_VERSION_MINOR @FRICLIENT_VERSION_MINOR@ +#define FRI_CLIENT_VERSION_MAJOR @FRI_CLIENT_VERSION_MAJOR@ +#define FRI_CLIENT_VERSION_MINOR @FRI_CLIENT_VERSION_MINOR@ #endif // FRI_VERSION_H