michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: make find_package(ZephyrUnittest...) REQUIRED

Browse source 
This commit is a followup to PR #25808 which updates the tests to
ensure the REQUIRED keyword is also used for the ZephyrUnitest package.

This provides a better error message when building with CMake and
forgetting ZEPHYR_BASE or not registering Zephyr in the CMake package
registry.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2020-05-29 22:17:26 +02:00 • committed by Carles Cufí
commit e1c1d1daca
11 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmake/app/boilerplate.cmake
View file

@ -9,10 +9,10 @@
# one of those lines:
#
# find_package(Zephyr)
# find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})
# find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
#
# The `HINTS $ENV{ZEPHYR_BASE}` variant is required for any application inside
# the Zephyr repository.
# The `REQUIRED HINTS $ENV{ZEPHYR_BASE}` variant is required for any application
# inside the Zephyr repository.
#
# It exists to reduce boilerplate code that Zephyr expects to be in
# application CMakeLists.txt code.

2
tests/unit/base64/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(base64)
set(SOURCES main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/crc/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(crc)
set(SOURCES main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/intmath/CMakeLists.txt
View file

@ -4,4 +4,4 @@ project(base64)
set(SOURCES
main.c
)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/list/CMakeLists.txt
View file

@ -7,4 +7,4 @@ set(SOURCES
dlist.c
sflist.c
)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/math_extras/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(math_extras)
set(SOURCES main.c portable.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/rbtree/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(rbtree)
set(SOURCES main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/timeutil/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(timeutil)
set(SOURCES main.c test_gmtime.c test_s32.c test_s64.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/unit/util/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(util)
set(SOURCES main.c ../../../lib/os/dec.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/ztest/base/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1)
if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES src/main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(base)
else()
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})

2
tests/ztest/mock/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1)
if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES src/main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE})
find_package(ZephyrUnittest REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(mock)
else()
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})