commit 9c2ce9bac62b1cefafdd2410a3f09ddb47f7dcb3
author Raef Coles <raef.coles@arm.com> Thu Oct 22 13:07:12 2020 +0100
committer Tamas Ban <tamas.ban@arm.com> Thu Oct 29 10:40:31 2020 +0000
tree db57cab209342c9820416e306365502b8fd1255e
parent af19ae94ac7acb4c4cac06138eafac221d0ddb2a

Build: Improve dependency version handling

Add version variable for tf-m-tests, and update handling so that the
version variable always corresponds exactly to the git tag/hash/branch

Change-Id: Id4fe50487c599b12640704eb1bde79117c79db19
Signed-off-by: Raef Coles <raef.coles@arm.com>

config/config_default.cmake

diff --git a/config/config_default.cmake b/config/config_default.cmake
index 648c357..065a74a 100644
--- a/config/config_default.cmake
+++ b/config/config_default.cmake
@@ -123,12 +123,13 @@
 ################################## Dependencies ################################
 
 set(MBEDCRYPTO_PATH                     "DOWNLOAD"  CACHE PATH      "Path to Mbed Crypto (or DOWNLOAD to fetch automatically")
-set(MBEDCRYPTO_VERSION                  "2.23.0"    CACHE STRING    "The version of Mbed Crypto to use")
+set(MBEDCRYPTO_VERSION                  "mbedtls-2.23.0" CACHE STRING "The version of Mbed Crypto to use")
 set(MBEDCRYPTO_BUILD_TYPE               "${CMAKE_BUILD_TYPE}" CACHE STRING "Build type of Mbed Crypto library")
 set(TFM_MBEDCRYPTO_CONFIG_PATH          "${CMAKE_SOURCE_DIR}/lib/ext/mbedcrypto/mbedcrypto_config/tfm_mbedcrypto_config_default.h" CACHE PATH "Config to use for Mbed Crypto")
 set(TFM_MBEDCRYPTO_PLATFORM_EXTRA_CONFIG_PATH "" CACHE PATH "Config to append to standard Mbed Crypto config, used by platforms to cnfigure feature support")
 
 set(TFM_TEST_REPO_PATH                  "DOWNLOAD"  CACHE PATH      "Path to TFM-TEST repo (or DOWNLOAD to fetch automatically")
+set(TFM_TEST_REPO_VERSION               "master"    CACHE PATH      "The version of tf-m-tests to use")
 set(CMSIS_5_PATH                        "DOWNLOAD"  CACHE PATH      "Path to CMSIS_5 (or DOWNLOAD to fetch automatically")
 
 set(MCUBOOT_PATH                        "DOWNLOAD"  CACHE PATH      "Path to MCUboot (or DOWNLOAD to fetch automatically")

lib/ext/mbedcrypto/CMakeLists.txt

diff --git a/lib/ext/mbedcrypto/CMakeLists.txt b/lib/ext/mbedcrypto/CMakeLists.txt
index 828a188..79adce1 100644
--- a/lib/ext/mbedcrypto/CMakeLists.txt
+++ b/lib/ext/mbedcrypto/CMakeLists.txt
@@ -20,7 +20,7 @@
     if (PATCH_FILES)
         FetchContent_Declare(mbedcrypto
             GIT_REPOSITORY https://github.com/ARMmbed/mbedtls.git
-            GIT_TAG mbedtls-${MBEDCRYPTO_VERSION}
+            GIT_TAG ${MBEDCRYPTO_VERSION}
             GIT_SHALLOW TRUE
             GIT_PROGRESS TRUE
             GIT_SUBMODULES ""
@@ -29,7 +29,7 @@
     else()
         FetchContent_Declare(mbedcrypto
             GIT_REPOSITORY https://github.com/ARMmbed/mbedtls.git
-            GIT_TAG mbedtls-${MBEDCRYPTO_VERSION}
+            GIT_TAG ${MBEDCRYPTO_VERSION}
             GIT_SHALLOW TRUE
             GIT_PROGRESS TRUE
             GIT_SUBMODULES ""

lib/ext/tf-m-tests/CMakeLists.txt

diff --git a/lib/ext/tf-m-tests/CMakeLists.txt b/lib/ext/tf-m-tests/CMakeLists.txt
index 3a1e60d..b26a0fd 100644
--- a/lib/ext/tf-m-tests/CMakeLists.txt
+++ b/lib/ext/tf-m-tests/CMakeLists.txt
@@ -16,6 +16,7 @@
 if ("${TFM_TEST_REPO_PATH}" STREQUAL "DOWNLOAD")
     FetchContent_Declare(tfm_test_repo
         GIT_REPOSITORY https://git.trustedfirmware.org/TF-M/tf-m-tests.git
+        GIT_TAG ${TFM_TEST_REPO_VERSION}
         GIT_SHALLOW TRUE
         GIT_PROGRESS TRUE
     )