commit 4d975dba7947331ee380c67c9e7716db1698d695
author Jan Van Winkel <jan.van_winkel@dxplore.eu> Sat May 04 14:44:56 2019 +0200
committer Carles Cufí <carles.cufi@nordicsemi.no> Sat May 04 16:40:06 2019 +0200
tree 90de2e935aead940cc8a51d99e1673110aa55d59
parent 735b287243115ce5595f43f812b5bd59f806472e

west: Renamed cmake.py to zcmake.py

Renamed cmake.py to zcmake.py to prevent import conflict if cmake is
installed through pip.

Signed-off-by: Jan Van Winkel <jan.van_winkel@dxplore.eu>

scripts/west_commands/build.py

diff --git a/scripts/west_commands/build.py b/scripts/west_commands/build.py
index 68f504d..ecdca21 100644
--- a/scripts/west_commands/build.py
+++ b/scripts/west_commands/build.py
@@ -9,7 +9,7 @@
 
 from west import log
 from west.configuration import config
-from cmake import DEFAULT_CMAKE_GENERATOR, run_cmake, run_build, CMakeCache
+from zcmake import DEFAULT_CMAKE_GENERATOR, run_cmake, run_build, CMakeCache
 from build_helpers import is_zephyr_build, find_build_dir, BUILD_DIR_DESCRIPTION
 
 from zephyr_ext_common import Forceable

scripts/west_commands/build_helpers.py

diff --git a/scripts/west_commands/build_helpers.py b/scripts/west_commands/build_helpers.py
index 63cdebc..a2bfb1b 100644
--- a/scripts/west_commands/build_helpers.py
+++ b/scripts/west_commands/build_helpers.py
@@ -10,7 +10,7 @@
 See build.py for the build command itself.
 '''
 
-import cmake
+import zcmake
 import os
 from west import log
 
@@ -51,7 +51,7 @@
     cache with a 'ZEPHYR_TOOLCHAIN_VARIANT' key.
     '''
     try:
-        cache = cmake.CMakeCache.from_build_dir(path)
+        cache = zcmake.CMakeCache.from_build_dir(path)
     except FileNotFoundError:
         cache = {}
 

scripts/west_commands/zcmake.py

diff --git a/scripts/west_commands/cmake.py b/scripts/west_commands/zcmake.py
similarity index 100%
rename from scripts/west_commands/cmake.py
rename to scripts/west_commands/zcmake.py