Updated examples/version

Author: felipe-iar

examples/version/CMakeLists.txt

@@ -1,21 +1,38 @@
 cmake_minimum_required(VERSION 3.20)
 
-# TODO 1: Add the `project()`'s `VERSION` and set it to `2.7.1`
 project(Project LANGUAGES C)
 
-add_executable(version)
+add_executable(target)
 
-target_sources(version PRIVATE main.c)
+target_sources(target PRIVATE main.c)
 
-# TODO 2: Configure `version.h.in` to generate `version.h`
-configure_file()
+# TODO 1: Set the target's `VERSION` to 1.2.3
 
-# TODO 3: Add the Project Binary Directory to the target's include directories
-target_include_directories()
 
-target_compile_options(version PRIVATE --cpu=cortex-m4)
 
-target_link_options(version PRIVATE 
+
+# TODO 2: Expose the target's `VERSION` to the application
+
+
+
+
+
+
+# TODO 3: Configure `version.h` from `version.h.in`
+
+
+
+
+
+# TODO 4: Add `build/include/` to target's include directories
+
+
+target_compile_options(target PRIVATE
+  --cpu=cortex-m4
+  --no_wrap_diagnostics
+)
+
+target_link_options(target PRIVATE
   --cpu=cortex-m4
   --semihosting)
 
@@ -24,17 +41,27 @@ enable_testing()
 cmake_path(GET CMAKE_C_COMPILER PARENT_PATH BIN_DIR)
 cmake_path(GET BIN_DIR PARENT_PATH TOOLKIT_DIR)
 cmake_path(GET TOOLKIT_DIR FILENAME TOOLKIT)
-add_test(NAME version-test
-         COMMAND ${BIN_DIR}/../../common/bin/CSpyBat
-         # C-SPY drivers for the Arm simulator via command line interface
-         ${BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${TOOLKIT}PROC${CMAKE_SHARED_LIBRARY_SUFFIX}
-         ${BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${TOOLKIT}SIM2${CMAKE_SHARED_LIBRARY_SUFFIX}
-         --plugin=${BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${TOOLKIT}LibsupportUniversal${CMAKE_SHARED_LIBRARY_SUFFIX}
-         # The target executable (built with debug information)
-         --debug_file=$<TARGET_FILE:version>
-         # C-SPY driver options
-         --backend
-           --cpu=cortex-m4
-           --semihosting)
-
-set_tests_properties(version-test PROPERTIES PASS_REGULAR_EXPRESSION "2.7.1")
+
+macro(iar_cspysim TESTNAME EXPECTED)
+  add_test(NAME ${TESTNAME}-test
+           COMMAND ${BIN_DIR}/../../common/bin/CSpyBat
+           # C-SPY drivers for the Arm simulator via command line interface
+           ${BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${TOOLKIT}PROC${CMAKE_SHARED_LIBRARY_SUFFIX}
+           ${BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${TOOLKIT}SIM2${CMAKE_SHARED_LIBRARY_SUFFIX}
+           --plugin=${BIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${TOOLKIT}LibsupportUniversal${CMAKE_SHARED_LIBRARY_SUFFIX}
+           # The target executable (built with debug information)
+           --debug_file=$<TARGET_FILE:target>
+           # C-SPY driver options
+           --backend
+             --cpu=cortex-m4
+             --semihosting
+  )
+  set_tests_properties(${TESTNAME}-test PROPERTIES
+    PASS_REGULAR_EXPRESSION ${EXPECTED}
+  )
+endmacro()
+
+# Add tests for the string-formatted version and for the integer-formatted version
+iar_cspysim("string-version"  "String version: $<TARGET_PROPERTY:target,VERSION>")
+iar_cspysim("integer-version" "Integer version: $<TARGET_PROPERTY:target,VERSION>")
+

examples/version/main.c

@@ -2,6 +2,27 @@
 
 #include "version.h"
 
+#if !defined(App_VERSION_MAJOR)
+#define App_VERSION_MAJOR 0
+#warning "App_VERSION_MAJOR defined but empty. Fallback to 0."
+#endif
+
+#if !defined(App_VERSION_MINOR)
+#define App_VERSION_MINOR 0
+#warning "App_VERSION_MINOR defined but empty. Fallback to 0."
+#endif
+
+#if !defined(App_VERSION_PATCH)
+#define App_VERSION_PATCH 0
+#warning "App_VERSION_PATCH defined but empty. Fallback to 0."
+#endif
+
+#if !defined(App_VERSION)
+#define App_VERSION "0.0.0"
+#warning "App_VERSION_PATCH defined but empty. Fallback to 0.0.0."
+#endif
+
 void main() {
-  printf("%d.%d.%d\n", Project_VERSION_MAJOR, Project_VERSION_MINOR, Project_VERSION_PATCH);
+  printf("Integer version: %d.%d.%d\n", App_VERSION_MAJOR, App_VERSION_MINOR, App_VERSION_PATCH);
+  printf("String version: %s\n", App_VERSION);
 }

examples/version/version.h.in

@@ -1,6 +1,7 @@
 #pragma once
 
-// TODO 4: Define the C macros with the CMake placeholders for version 
-#define Project_VERSION_MAJOR 
-#define Project_VERSION_MINOR 
-#define Project_VERSION_PATCH 
+// TODO 5: Import CMake's version variables as preprocessor-defined symbols
+
+
+
+