[nrf fromtree] Build: Update TF-M versioning logic

- Bump manual fallback version to v2.2.2**
- Refine version fallback mechanism to append '**' when Git tags are
  unavailable, indicating uncertainty in the exact TF-M version

Signed-off-by: Anton Komlev <anton.komlev@arm.com>
Change-Id: I8d5d38a19a43db5981e64ecdc7379ec0906f6d5e
(cherry picked from commit a151f86)

Author: Anton-TF

cmake/version.cmake

@@ -5,13 +5,16 @@
 #
 #-------------------------------------------------------------------------------
 
-# The 'TFM_VERSION_MANUAL' is used for fallback when Git tags are not available
-set(TFM_VERSION_MANUAL "2.2.2")
+# TFM_VERSION_MANUAL is used as a fallback when Git tags aren’t available.
+# The '**' is added on purpose to show that the version is uncertain in that case.
+# Please keep it in place when updating.
+set(TFM_VERSION_MANUAL "2.2.2**")
 
 if(TRUE)
     # Git execution fails.
     # Applying a manual version assuming the code tree is a local copy.
     set(TFM_VERSION_FULL "v${TFM_VERSION_MANUAL}")
+    string(REGEX REPLACE "\\*\\*$" "" TFM_VERSION ${TFM_VERSION_MANUAL})
     return()
 endif()
 
@@ -25,15 +28,19 @@ if(TFM_TAG EQUAL -1)
         OUTPUT_VARIABLE TFM_GIT_HASH
         OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+    message(WARNING "Unable to detect TF-M version from Git tags. Using TFM_VERSION_MANUAL=" ${TFM_VERSION_MANUAL} " override")
     set(TFM_VERSION_FULL "v${TFM_VERSION_MANUAL}+g${TFM_GIT_HASH}")
 endif()
 
 string(REGEX REPLACE "TF-M" "" TFM_VERSION_FULL ${TFM_VERSION_FULL})
-# remove a commit number
-string(REGEX REPLACE "-[0-9]+-g" "+" TFM_VERSION_FULL ${TFM_VERSION_FULL})
+
+# Derive TFM_VERSION from TFM_VERSION_FULL by removing any appended commit
+# number, for use as the CMake project version
+string(REGEX REPLACE "-[0-9]+-" "+" TFM_VERSION_FULL ${TFM_VERSION_FULL})
 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" TFM_VERSION ${TFM_VERSION_FULL})
 
 # Check that manually set version is up to date
-if (NOT TFM_VERSION_MANUAL STREQUAL TFM_VERSION)
-    message(WARNING "TFM_VERSION_MANUAL mismatches to actual TF-M version. Please update TFM_VERSION_MANUAL in cmake/version.cmake")
+string(REGEX REPLACE "\\*\\*$" "" TFM_VERSION_MANUAL_CLEAN "${TFM_VERSION_MANUAL}")
+if (NOT TFM_VERSION_MANUAL_CLEAN STREQUAL TFM_VERSION)
+    message(WARNING "TFM_VERSION_MANUAL=" ${TFM_VERSION_MANUAL} " mismatches to actual TF-M version=" ${TFM_VERSION} ". Please update TFM_VERSION_MANUAL in cmake/version.cmake")
 endif()