feat: allow specifying FW version instead of relying on git tag

Author: JPHutchins

src/ic_project.cmake

@@ -62,6 +62,7 @@ function(ic_project
     set(optional_keyword_args
         BOARD_REV
         BUILD_TYPE
+        FW_VERSION
     )
     list(APPEND keyword_args
         ${required_keyword_args}
@@ -95,6 +96,8 @@ function(ic_project
 
     set_definition("${out_board_name}" "${_BOARD_NAME}" PARENT_SCOPE)
     if_set_definition("${out_board_rev}" "${_BOARD_REV}" PARENT_SCOPE)
+    if_set_definition("${out_fw_version}" "${_FW_VERSION}" PARENT_SCOPE)
+    if_set_definition("${out_build_type}" "${_BUILD_TYPE}" PARENT_SCOPE)
 
     # Warn about git tag
     execute_process(
@@ -104,27 +107,40 @@ function(ic_project
         OUTPUT_QUIET
     )
     if(res AND NOT res EQUAL 0)
-        message(
-            WARNING
-            "The ${out_fw_version} should be set by git tag but there is no tag"
-        )
+        if(NOT DEFINED ${out_fw_version})
+            message(
+                WARNING
+                "The ${out_fw_version} should be set by git tag but there is no tag"
+            )
+        endif()
         set(has_git_tag 0)
     else()
         set(has_git_tag 1)
+        execute_process(
+            COMMAND git describe --tags --dirty=+ --always --abbrev=7
+            OUTPUT_VARIABLE git_tag
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
     endif()
 
-    # Set firmware version
+    # Set short git commit hash
     execute_process(
-        COMMAND git describe --tags --dirty=+ --always --abbrev=7
-        OUTPUT_VARIABLE git_tag
+        COMMAND git describe --dirty=+ --always --abbrev=7 --exclude *
+        OUTPUT_VARIABLE git_hash
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    set_definition("${out_fw_version}" ${git_tag} PARENT_SCOPE)
+    set_definition("${out_git_hash}" ${git_hash} PARENT_SCOPE)
 
-    if_set_definition("${out_build_type}" "${_BUILD_TYPE}" PARENT_SCOPE)
+    if(NOT DEFINED ${out_fw_version})
+        if(${has_git_tag})
+            set_definition("${out_fw_version}" ${git_tag} PARENT_SCOPE)
+        else()
+            set_definition("${out_fw_version}" ${git_hash} PARENT_SCOPE)
+        endif()
+    endif()
 
     # Set git dirty commit
-    string(FIND ${git_tag} + res)
+    string(FIND ${git_hash} + res)
     if(res EQUAL -1)
         set_definition("${out_git_dirty}" 0 PARENT_SCOPE)
     else()
@@ -150,14 +166,6 @@ function(ic_project
         set_definition("${out_git_tag_rev}" "" PARENT_SCOPE)
     endif()
 
-    # Set short git commit hash
-    execute_process(
-        COMMAND git describe --dirty=+ --always --abbrev=7 --exclude *
-        OUTPUT_VARIABLE git_hash
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    set_definition("${out_git_hash}" ${git_hash} PARENT_SCOPE)
-
     string(TIMESTAMP build_date "%Y%m%d")
     set_definition("${out_build_date}" ${build_date} PARENT_SCOPE)
     string(TIMESTAMP timestamp)

src/ic_utils.cmake

@@ -44,6 +44,7 @@ macro(set_definition name value)
     endif()
 
     set(${name} ${value} ${ARGN})
+    set(${name} ${value})
     add_compile_definitions(${name}=${value})
     message(STATUS "${name} = ${value}")
 endmacro()

tests/test_ic_project.cmake

@@ -35,6 +35,10 @@ assert("Dipple Snurp 3" STREQUAL ${IC_PROJECT_NAME})
 assert(FF3 STREQUAL ${IC_BOARD_NAME})
 assert(${IC_FULL_NAME} MATCHES Flumbr_Dipple_Snurp_3_FF3_.+_[0-9]+)
 
+foreach(ic_out_var ${ic_out})
+    unset("${ic_out_var}")
+endforeach()
+
 test_cmake_group_end()
 
 test_cmake_group_begin("ic_project() with optional args")
@@ -68,4 +72,30 @@ assert(proto STREQUAL ${IC_BUILD_TYPE})
 assert(Flampr STREQUAL ${IC_CLIENT_NAME})
 assert(${IC_FULL_NAME} MATCHES Flampr_flying-vanilla-bean_toffee@NFF2_.+_[0-9]+_proto)
 
+foreach(ic_out_var ${ic_out})
+    unset("${ic_out_var}")
+endforeach()
+
+test_cmake_group_end()
+
+test_cmake_group_begin("ic_project() with FW_VERSION arg")
+
+ic_project_out(ic_out)
+ic_project(
+    # output variables
+    ${ic_out}
+
+    # keyword arguments
+    CLIENT_NAME "Flumbr"
+    PROJECT_NAME "Dipple Snurp 3"
+    BOARD_NAME FF3
+    FW_VERSION 1.0.0
+)
+
+assert(1.0.0 STREQUAL ${IC_FW_VERSION})
+
+foreach(ic_out_var ${ic_out})
+    unset("${ic_out_var}")
+endforeach()
+
 test_cmake_group_end()