Skip to content

Commit bcfd8ba

Browse files
ddeleticDhruvaG2000
ddeletic
authored and
DhruvaG2000
committed
samples: Fix paths to overlay files given to cmake on Windows
When building samples on Windows, path to overlay file must be given in the form that cmake can understand. Which means paths must not have single backslash (\) character in them. However $ENV(ZEPHYR_BASE) contains exactly that (e.g. C:\Users\...). We fix this by passing $ENV(ZEPHYR_BASE) through cmake_path(). Signed-off-by: Dejan Deletic <ddeletic@gmail.com>
1 parent 976925a commit bcfd8ba

File tree

9 files changed

+18
-9
lines changed

9 files changed

+18
-9
lines changed

‎samples/analog_input/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(analog_input)

‎samples/attach_interrupt/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(attach_interrupt)

‎samples/blinky_arduino/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(blinky)

‎samples/button_press_led/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(blinky)

‎samples/fade/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(fade)

‎samples/hello_arduino/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(hello_world)

‎samples/i2cdemo/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(blinky)

‎samples/serial_event/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(serial_event)

‎samples/threads_arduino/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
cmake_minimum_required(VERSION 3.20.0)
44

5-
set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
5+
cmake_path(SET ZephyrBase $ENV{ZEPHYR_BASE})
6+
set(DTC_OVERLAY_FILE ${ZephyrBase}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
67

78
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
89
project(threads)

0 commit comments

Comments
 (0)