Cmakelists: Generalise overlay path

DhruvaG2000 · DhruvaG2000 · commit 972a39f9366a · 2022-08-17T21:07:38.000+05:30
Cmakelists was unable to previously find the overlay path that was board specific
This path had to be hardcoded into each sample for each different board.
Now, with the help of BOARD variable we can automatically find the overlay path using cmake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,2 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
 add_subdirectory(cores)
-add_subdirectory(variants)
+add_subdirectory(variants)
diff --git a/samples/blinky_arduino/CMakeLists.txt b/samples/blinky_arduino/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
 
diff --git a/samples/button_press_led/CMakeLists.txt b/samples/button_press_led/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
 
diff --git a/samples/hello_arduino/CMakeLists.txt b/samples/hello_arduino/CMakeLists.txt
@@ -2,10 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hello_world)
 
 target_sources(app PRIVATE src/app.cpp)
 
-zephyr_compile_options(-Wno-unused-variable -Wno-comment)
+zephyr_compile_options(-Wno-unused-variable -Wno-comment)
diff --git a/samples/threads_arduino/CMakeLists.txt b/samples/threads_arduino/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(threads)
diff --git a/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay b/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay
diff --git a/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble_pinmap.h b/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble_pinmap.h
diff --git a/variants/CMakeLists.txt b/variants/CMakeLists.txt
@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 zephyr_include_directories(.)
-zephyr_include_directories(ARDUINO_NANO_33_BLE)
-zephyr_include_directories(ARDUINO_NANO_33_BLE_SENSE)
-zephyr_include_directories(ARDUINO_NANO_33_IOT)
+zephyr_include_directories(${BOARD})
