Skip to content
Permalink
Browse files

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>
  • Loading branch information...
vanwinkeljan authored and carlescufi committed May 4, 2019
1 parent 735b287 commit 4d975dba7947331ee380c67c9e7716db1698d695
@@ -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
@@ -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 @@ def is_zephyr_build(path):
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 = {}

File renamed without changes.

0 comments on commit 4d975db

Please sign in to comment.
You can’t perform that action at this time.