From 3ffdcf4fca418f8376f76bfec990cc533dce54db Mon Sep 17 00:00:00 2001 From: Sigvart Hovland Date: Fri, 12 Apr 2019 12:17:14 +0200 Subject: [PATCH] cmake: boilerplate: Fix ZEPHYR_BASE variable for windows In windows an additional / is added when using zephyr-env.cmd this causes a build error in some scenarios. It also creates ugly file paths. Signed-off-by: Sigvart Hovland --- cmake/app/boilerplate.cmake | 4 ++++ cmake/kconfig.cmake | 1 + 2 files changed, 5 insertions(+) diff --git a/cmake/app/boilerplate.cmake b/cmake/app/boilerplate.cmake index 53e693e03ff..f95fa48fb1e 100644 --- a/cmake/app/boilerplate.cmake +++ b/cmake/app/boilerplate.cmake @@ -77,8 +77,12 @@ set(PROJECT_SOURCE_DIR $ENV{ZEPHYR_BASE}) # Convert path to use the '/' separator string(REPLACE "\\" "/" PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}) +# Remove trailing '/', it results in ugly paths and also exposes some bugs +string(REGEX REPLACE "\/+$" "" PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}) + set(ZEPHYR_BINARY_DIR ${PROJECT_BINARY_DIR}) set(ZEPHYR_BASE ${PROJECT_SOURCE_DIR}) +set(ENV{ZEPHYR_BASE} ${ZEPHYR_BASE}) set(AUTOCONF_H ${__build_dir}/include/generated/autoconf.h) # Re-configure (Re-execute all CMakeLists.txt code) when autoconf.h changes diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake index 002e87dc7e7..7c72e080fd5 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -63,6 +63,7 @@ foreach(kconfig_target PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} srctree=${ZEPHYR_BASE} KERNELVERSION=${KERNELVERSION} + ZEPHYR_BASE=${ZEPHYR_BASE} KCONFIG_CONFIG=${DOTCONFIG} ARCH=$ENV{ARCH} BOARD_DIR=$ENV{BOARD_DIR}