michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Speed up CMake by not invoking 'west'

Browse source 
Speed up CMake by 100ms by importing west instead of invoking it as an
executable.

There is significant overhead in invoking west as a script via
pip. The exact reason why is not clear.

Also, simplify the version output parsing as we get the version in a
more machine-readable form now.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2019-11-05 16:54:20 +01:00 • committed by Maureen Helm
commit 6d6173f247
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
cmake/host-tools.cmake
View file

@ -15,31 +15,25 @@ else()
set(MIN_WEST_VERSION 0.6.0) set(MIN_WEST_VERSION 0.6.0)
execute_process( execute_process(
COMMAND COMMAND
${WEST} --version ${PYTHON_EXECUTABLE}
OUTPUT_VARIABLE west_version_output -c
"import west.version; print(west.version.__version__, end='')"
OUTPUT_VARIABLE west_version
RESULT_VARIABLE west_version_output_result
) )
# The west --version output is currently multiline: bootstrapper if(west_version_output_result)
# followed by installation version. Test both. This will still work message(FATAL_ERROR "Unable to import west.version from '${PYTHON_EXECUTABLE}'")
# when .west/west is eliminated from the installation and obtained endif()
# via pypi, which will result in a single line of output.
string(REGEX REPLACE "\n" ";" west_version_output "${west_version_output}") if(${west_version} VERSION_LESS ${MIN_WEST_VERSION})
foreach(item ${west_version_output}) message(FATAL_ERROR "The detected west version is unsupported.\n\
if("${item}" MATCHES "^[^\/\\]*v([0-9]+[.][0-9]+[.][0-9]+)")
set(west_version "${CMAKE_MATCH_1}")
if(${west_version} VERSION_LESS ${MIN_WEST_VERSION})
message(FATAL_ERROR "The detected west version is unsupported.\n\
The version was found to be ${west_version}:\n\ The version was found to be ${west_version}:\n\
${item}\n\ ${item}\n\
But the minimum supported version is ${MIN_WEST_VERSION}\n\ But the minimum supported version is ${MIN_WEST_VERSION}\n\
Please upgrade, e.g. with:\n\ Please upgrade with:\n\
pip3 install --upgrade west\n\ pip3 install --upgrade west")
if the version from pip is too old, or:\n\ endif()
west update\n\
if the version in the installation is too old.")
endif()
endif()
endforeach()
# Just output information for a single version. This will still work # Just output information for a single version. This will still work
# 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}\")")