michaelh/zephyr
1
0
Fork 0
Code Releases Activity

llext-edk: (refactor) unify variable names

Browse source 
The variable llext_edk_cflags was used in the main CMakeLists.txt file,
while llext_cflags was used in the llext-edk.cmake file. This commit
unifies the variable names to use llext_edk_cflags in both files.

No logic changes are introduced by this commit.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
This commit is contained in:
Luca Burelli 2024-08-06 17:24:20 +02:00 • committed by Carles Cufí
commit c77bcd2cf8
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -2162,7 +2162,7 @@ add_custom_command(
-DAPPLICATION_SOURCE_DIR=${APPLICATION_SOURCE_DIR} -DAPPLICATION_SOURCE_DIR=${APPLICATION_SOURCE_DIR}
-DINTERFACE_INCLUDE_DIRECTORIES="$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>" -DINTERFACE_INCLUDE_DIRECTORIES="$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>"
-Dllext_edk_file=${llext_edk_file} -Dllext_edk_file=${llext_edk_file}
-Dllext_cflags="${llext_edk_cflags}" -Dllext_edk_cflags="${llext_edk_cflags}"
-Dllext_edk_name=${CONFIG_LLEXT_EDK_NAME} -Dllext_edk_name=${CONFIG_LLEXT_EDK_NAME}
-DWEST_TOPDIR=${WEST_TOPDIR} -DWEST_TOPDIR=${WEST_TOPDIR}
-DZEPHYR_BASE=${ZEPHYR_BASE} -DZEPHYR_BASE=${ZEPHYR_BASE}

13
cmake/llext-edk.cmake
View file

@ -18,7 +18,7 @@
# from. It should simply be the INTERFACE_INCLUDE_DIRECTORIES property of the # from. It should simply be the INTERFACE_INCLUDE_DIRECTORIES property of the
# zephyr_interface target. # zephyr_interface target.
# - llext_edk_file: Output file name for the tarball. # - llext_edk_file: Output file name for the tarball.
# - llext_cflags: Additional flags to be added to the generated flags. # - llext_edk_cflags: Flags to be used for source compile commands.
# - ZEPHYR_BASE: Path to the zephyr base directory. # - ZEPHYR_BASE: Path to the zephyr base directory.
# - WEST_TOPDIR: Path to the west top directory. # - WEST_TOPDIR: Path to the west top directory.
# - APPLICATION_SOURCE_DIR: Path to the application source directory. # - APPLICATION_SOURCE_DIR: Path to the application source directory.
@ -93,10 +93,10 @@ string(REGEX REPLACE "[^a-zA-Z0-9]" "_" llext_edk_name_sane ${llext_edk_name})
string(TOUPPER ${llext_edk_name_sane} llext_edk_name_sane) string(TOUPPER ${llext_edk_name_sane} llext_edk_name_sane)
set(install_dir_var "${llext_edk_name_sane}_INSTALL_DIR") set(install_dir_var "${llext_edk_name_sane}_INSTALL_DIR")
separate_arguments(llext_cflags NATIVE_COMMAND ${llext_cflags}) separate_arguments(llext_edk_cflags NATIVE_COMMAND ${llext_edk_cflags})
set(make_relative FALSE) set(make_relative FALSE)
foreach(flag ${llext_cflags}) foreach(flag ${llext_edk_cflags})
if (flag STREQUAL "-imacros") if (flag STREQUAL "-imacros")
set(make_relative TRUE) set(make_relative TRUE)
elseif (make_relative) elseif (make_relative)
@ -116,11 +116,10 @@ foreach(flag ${llext_cflags})
list(APPEND new_cflags ${flag}) list(APPEND new_cflags ${flag})
endif() endif()
endforeach() endforeach()
set(llext_cflags ${new_cflags}) set(llext_edk_cflags ${new_cflags})
list(APPEND base_flags_make ${llext_edk_cflags} ${imacros_make} -DLL_EXTENSION_BUILD)
list(APPEND base_flags_make ${llext_cflags} ${imacros_make} -DLL_EXTENSION_BUILD) list(APPEND base_flags_cmake ${llext_edk_cflags} ${imacros_cmake} -DLL_EXTENSION_BUILD)
list(APPEND base_flags_cmake ${llext_cflags} ${imacros_cmake} -DLL_EXTENSION_BUILD)
separate_arguments(include_dirs NATIVE_COMMAND ${INTERFACE_INCLUDE_DIRECTORIES}) separate_arguments(include_dirs NATIVE_COMMAND ${INTERFACE_INCLUDE_DIRECTORIES})
file(MAKE_DIRECTORY ${llext_edk_inc}) file(MAKE_DIRECTORY ${llext_edk_inc})