michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Bump MIN_WEST_VERSION to 0.7.1

Browse source 
Updated WEST_DIR requires version >= 0.7.0

Signed-off-by: Emil Hammarstrom <emil.a.hammarstrom@gmail.com>
This commit is contained in:
Emil Hammarstrom 2020-02-26 19:34:42 +01:00 • committed by Carles Cufí
commit df9adeca44
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmake/host-tools.cmake
View file

@ -12,7 +12,7 @@ if(${WEST} STREQUAL WEST-NOTFOUND)
else() else()
# If west is found, make sure its version matches the minimum # If west is found, make sure its version matches the minimum
# required one. # required one.
set(MIN_WEST_VERSION 0.6.0) set(MIN_WEST_VERSION 0.7.1)
execute_process( execute_process(
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
@ -38,14 +38,12 @@ else()
# even after output is one line. # even after output is one line.
message(STATUS "Found west: ${WEST} (found suitable version \"${west_version}\", minimum required is \"${MIN_WEST_VERSION}\")") message(STATUS "Found west: ${WEST} (found suitable version \"${west_version}\", minimum required is \"${MIN_WEST_VERSION}\")")
if (${west_version} VERSION_GREATER_EQUAL "0.7.1")
execute_process( execute_process(
COMMAND ${WEST} topdir COMMAND ${WEST} topdir
OUTPUT_VARIABLE WEST_TOPDIR OUTPUT_VARIABLE WEST_TOPDIR
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
endif() endif()
endif()
# dtc is an optional dependency. Search for it on PATH and in # dtc is an optional dependency. Search for it on PATH and in
# TOOLCHAIN_HOME. Usually DTC will be provided by an SDK, but for # TOOLCHAIN_HOME. Usually DTC will be provided by an SDK, but for