Skip to content

Commit

Permalink
openthread: Added nrfxlib release tag to CMAKE function
Browse files Browse the repository at this point in the history
Added NRFXLIB_RELEASE_TAG to the configuration file to save
information for which release tag the libraries have been
generated.

Signed-off-by: Arkadiusz Balys <[email protected]>
  • Loading branch information
ArekBalysNordic committed Sep 9, 2024
1 parent 82c2271 commit 041f6bb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion openthread/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if(CONFIG_OPENTHREAD_SOURCES)

set(OPENTHREAD_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/openthread_lib_configuration.txt")

openthread_libs_configuration_write(${OPENTHREAD_CONFIG_FILE})
openthread_libs_configuration_write(${OPENTHREAD_CONFIG_FILE} ${CONFIG_OPENTHREAD_NRFXLIB_RELEASE_TAG})

openthread_calculate_lib_path("v${CONFIG_OPENTHREAD_THREAD_VERSION}" OPENTHREAD_DST_DIR)

Expand Down
7 changes: 7 additions & 0 deletions openthread/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,13 @@ config OPENTHREAD_BUILD_OUTPUT_STRIPPED
help
Build a stripped library versions of OpenThread in the build directory.

config OPENTHREAD_NRFXLIB_RELEASE_TAG
string "Release tag for OpenThread libraries"
default "Not specified"
help
The release tag will be added to the openthread_lib_configuration.txt file
within the OpenThread library directory.

endmenu # "OpenThread"

endif
4 changes: 3 additions & 1 deletion openthread/cmake/extensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ endmacro()

# Store the configuration of the compiled OpenThread libraries
# and set source and destination paths.
function(openthread_libs_configuration_write CONFIG_FILE)
function(openthread_libs_configuration_write CONFIG_FILE NRFXLIB_RELEASE_TAG)
# Store all OT related variables
get_cmake_property(_variableNames VARIABLES)
foreach (_variableName ${_variableNames})
Expand All @@ -77,6 +77,8 @@ function(openthread_libs_configuration_write CONFIG_FILE)

get_git_decribe(${ZEPHYR_OPENTHREAD_MODULE_DIR})
list(INSERT OPENTHREAD_SETTINGS 0 "OpenThread_commit=${git_describe}")

list(INSERT OPENTHREAD_SETTINGS 0 "NRFXLIB_RELEASE_TAG=${NRFXLIB_RELEASE_TAG}\n")
endif()

# Store compiler and Zephyr SDK version
Expand Down

0 comments on commit 041f6bb

Please sign in to comment.