aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRaef Coles <raef.coles@arm.com>2020-10-22 13:07:12 +0100
committerTamas Ban <tamas.ban@arm.com>2020-10-29 10:40:31 +0000
commit9c2ce9bac62b1cefafdd2410a3f09ddb47f7dcb3 (patch)
treedb57cab209342c9820416e306365502b8fd1255e /lib
parentaf19ae94ac7acb4c4cac06138eafac221d0ddb2a (diff)
downloadtrusted-firmware-m-9c2ce9bac62b1cefafdd2410a3f09ddb47f7dcb3.tar.gz
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>
Diffstat (limited to 'lib')
-rw-r--r--lib/ext/mbedcrypto/CMakeLists.txt4
-rw-r--r--lib/ext/tf-m-tests/CMakeLists.txt1
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ext/mbedcrypto/CMakeLists.txt b/lib/ext/mbedcrypto/CMakeLists.txt
index 828a18867..79adce160 100644
--- a/lib/ext/mbedcrypto/CMakeLists.txt
+++ b/lib/ext/mbedcrypto/CMakeLists.txt
@@ -20,7 +20,7 @@ if ("${MBEDCRYPTO_PATH}" STREQUAL "DOWNLOAD")
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 @@ if ("${MBEDCRYPTO_PATH}" STREQUAL "DOWNLOAD")
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 ""
diff --git a/lib/ext/tf-m-tests/CMakeLists.txt b/lib/ext/tf-m-tests/CMakeLists.txt
index 3a1e60d17..b26a0fde9 100644
--- a/lib/ext/tf-m-tests/CMakeLists.txt
+++ b/lib/ext/tf-m-tests/CMakeLists.txt
@@ -16,6 +16,7 @@ endif()
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
)