michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: rework empty zephyr libraries handling.

Browse source 
This is an update to #34289.

When using CMake <=3.18 an interface library may not use the property
SOURCES.

Therefore, if an interface lib is added to the list of ZEPHYR_LIBS, then
CMake <=3.18 will raise the following error:
```
CMake Error .... (get_property):
  INTERFACE_LIBRARY targets may only have whitelisted properties.
  The property "SOURCES" is not allowed.
```

Therefore the check has been reworked into two steps.
First ensure all libs are static, and if they are, then check if they
are empty and not imported.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2021-04-23 09:09:49 +02:00 • committed by Carles Cufí
commit 25578be909
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
CMakeLists.txt
View file

@ -700,27 +700,29 @@ add_subdirectory(kernel)
get_property(ZEPHYR_LIBS_PROPERTY GLOBAL PROPERTY ZEPHYR_LIBS) get_property(ZEPHYR_LIBS_PROPERTY GLOBAL PROPERTY ZEPHYR_LIBS)
foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY}) foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY})
get_property(source_list TARGET ${zephyr_lib} PROPERTY SOURCES)
get_property(lib_type TARGET ${zephyr_lib} PROPERTY TYPE) get_property(lib_type TARGET ${zephyr_lib} PROPERTY TYPE)
get_property(lib_imported TARGET ${zephyr_lib} PROPERTY IMPORTED)
# To prevent CMake failure when a driver is enabled, for example: REGULATOR=y # To prevent CMake failure when a driver is enabled, for example: REGULATOR=y
# we disable any Zephyr libraries without sources and adds the `empty_file.c`. # we disable any Zephyr libraries without sources and adds the `empty_file.c`.
if(${lib_type} STREQUAL STATIC_LIBRARY if(${lib_type} STREQUAL STATIC_LIBRARY
AND NOT ${lib_imported}
AND NOT source_list
AND NOT ${zephyr_lib} STREQUAL app AND NOT ${zephyr_lib} STREQUAL app
) )
message(WARNING get_property(source_list TARGET ${zephyr_lib} PROPERTY SOURCES)
"No SOURCES given to Zephyr library: ${zephyr_lib}\nExcluding target from build." get_property(lib_imported TARGET ${zephyr_lib} PROPERTY IMPORTED)
if(NOT source_list
AND NOT ${lib_imported}
) )
target_sources(${zephyr_lib} PRIVATE ${ZEPHYR_BASE}/misc/empty_file.c) message(WARNING
set_property(TARGET ${zephyr_lib} PROPERTY EXCLUDE_FROM_ALL TRUE) "No SOURCES given to Zephyr library: ${zephyr_lib}\nExcluding target from build."
list(REMOVE_ITEM ZEPHYR_LIBS_PROPERTY ${zephyr_lib}) )
else() target_sources(${zephyr_lib} PRIVATE ${ZEPHYR_BASE}/misc/empty_file.c)
# TODO: Could this become an INTERFACE property of zephyr_interface? set_property(TARGET ${zephyr_lib} PROPERTY EXCLUDE_FROM_ALL TRUE)
add_dependencies(${zephyr_lib} zephyr_generated_headers) list(REMOVE_ITEM ZEPHYR_LIBS_PROPERTY ${zephyr_lib})
continue()
endif()
endif() endif()
# TODO: Could this become an INTERFACE property of zephyr_interface?
add_dependencies(${zephyr_lib} zephyr_generated_headers)
endforeach() endforeach()
get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT) get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)