Skip to content

Commit

Permalink
Merge branch 'fri-1.15' into fri-2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
mhubii committed May 30, 2024
2 parents 2f66cd2 + 04fb6f0 commit ef79b5b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ 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})
Expand Down

0 comments on commit ef79b5b

Please sign in to comment.