version: Replace bespoke application version with new version system

Uses Zephyr's new version infrastruction system for configuring the version of the application and displaying it. Signed-off-by: Jamie McCrae <[email protected]>
Makerville · May 23, 2023 · 2c85d92 · 2c85d92
1 parent be3bfb0
commit 2c85d92
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 36 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -7,9 +7,6 @@
 cmake_minimum_required(VERSION 3.13.1)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
-project(app LANGUAGES C VERSION 1.0.0)
-
-configure_file(app_version.h.in ${CMAKE_BINARY_DIR}/app/include/app_version.h)
-target_include_directories(app PRIVATE ${CMAKE_BINARY_DIR}/app/include src)
+project(app LANGUAGES C)
 
 target_sources(app PRIVATE src/main.c)
diff --git a/app/VERSION b/app/VERSION
@@ -0,0 +1,5 @@
+VERSION_MAJOR = 1
+VERSION_MINOR = 0
+PATCHLEVEL = 0
+VERSION_TWEAK = 0
+EXTRAVERSION =
diff --git a/app/app_version.h.in b/app/app_version.h.in
diff --git a/app/src/main.c b/app/src/main.c
@@ -5,8 +5,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
-
-#include "app_version.h"
+#include <app_version.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, CONFIG_APP_LOG_LEVEL);
@@ -16,7 +15,7 @@ int main(void)
 	int ret;
 	const struct device *sensor;
 
-	printk("Zephyr Example Application %s\n", APP_VERSION_STR);
+	printk("Zephyr Example Application %s\n", APP_VERSION_STRING);
 
 	sensor = DEVICE_DT_GET(DT_NODELABEL(examplesensor0));
 	if (!device_is_ready(sensor)) {