From 5e4710ce68f14766a604e4b46c772af20b5cf925 Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Wed, 28 Jun 2023 12:29:01 +0200 Subject: [PATCH] cmake: cleanup old west version support When west is used by Zephyr, then minimum required version is 0.14.0. Therefore cleanup west.cmake by removing code which are created to support west versions =< 0.7.x. Signed-off-by: Torsten Rasmussen --- cmake/modules/west.cmake | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/cmake/modules/west.cmake b/cmake/modules/west.cmake index c6428ff547..f35e7a3c3f 100644 --- a/cmake/modules/west.cmake +++ b/cmake/modules/west.cmake @@ -72,21 +72,9 @@ else() ${PYTHON_EXECUTABLE_OUT_OF_SYNC}\n") endif() - # Set WEST to a COMMAND prefix as if it were a find_program() - # result. - # - # From west 0.8 forward, you can run 'python -m west' to run - # the command line application. - set(WEST_MODULE west) - if(${west_version} VERSION_LESS 0.8) - # In west 0.7.x, this wasn't supported yet, but it happens to be - # possible to run 'python -m west.app.main'. - string(APPEND WEST_MODULE .app.main) - endif() - - # Need to cache this so the Zephyr Eclipse plugin knows - # how to invoke West. - set(WEST ${PYTHON_EXECUTABLE} -m ${WEST_MODULE} CACHE INTERNAL "West") + # Set WEST to a COMMAND prefix as if it were a find_program() result, and + # cache the value so the Zephyr Eclipse plugin knows how to invoke West. + set(WEST ${PYTHON_EXECUTABLE} -m west CACHE INTERNAL "West") # Print information about the west module we're relying on. This # will still work even after output is one line.