[OSCBS-41] Update to Zephyr v3.2.0 (#382)
Updating to integrate with Zephyr v3.2.0 required: - Update `west.yml` to import Zephyr v3.2.0 manifest - Prefix include pathname of ztest.h with `zephyr/` - Prefix every Zephyr header included pathname with `zephyr/` - Change all Zephyr tests/samples to use `find_package` - For unit_testing, use a distinct prj.conf which only references Kconfigs defined in the Zephyr repo. (Zephyr constraint.) - Move ztest headers into a zephyr-prefixed pathname Co-authored-by: Gregory Shue <gregory.shue@legrand.com>
This commit is contained in:
@@ -41,10 +41,11 @@ if(BOARD STREQUAL unit_testing)
|
||||
|
||||
add_definitions(-DBACNET_ADDRESS_CACHE_FILE=1)
|
||||
|
||||
include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
|
||||
set(CONF_FILE "${CONF_FILE};prj.unit_testing.conf")
|
||||
find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(${BACNET_NAME})
|
||||
else()
|
||||
include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
|
||||
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(${BACNET_NAME})
|
||||
|
||||
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
CONFIG_ZTEST=y
|
||||
#CONFIG_BACNETSTACK=y
|
||||
#CONFIG_BACNET_ADDRESS_CACHE_FILE=y
|
||||
Reference in New Issue
Block a user