aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGyorgy <gyorgy.szing@arm.com>2023-09-28 13:58:36 +0000
committerGyorgy Szing <Gyorgy.Szing@arm.com>2023-09-28 16:36:54 +0200
commitb27d4163e01065d1203bd71ffa6562a651f77a13 (patch)
treee8f627bf88ee4c27d5bde0d3b3898ca41ca4109e
parent30731cefda78feb1e67a39afab0a0393edfa5128 (diff)
downloadtrusted-services-main.tar.gz
Fix: make libts version handling dynamicHEADv1.0.0_rc1v1.0.0main
Change cmake scripts to use same source of truth when building and when searching for libts. Change-Id: I75d8be110b6b4dc601a9eaedc603214bf566b91a Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
-rw-r--r--deployments/libts/libts-import.cmake7
1 files changed, 5 insertions, 2 deletions
diff --git a/deployments/libts/libts-import.cmake b/deployments/libts/libts-import.cmake
index 84a897aa7..fd016ca7e 100644
--- a/deployments/libts/libts-import.cmake
+++ b/deployments/libts/libts-import.cmake
@@ -13,7 +13,10 @@
#-------------------------------------------------------------------------------
option(CFG_FORCE_PREBUILT_LIBTS Off)
# Try to find a pre-build package.
-find_package(libts "1.0.0" QUIET PATHS ${CMAKE_CURRENT_BINARY_DIR}/libts_install/${TS_ENV}/lib/cmake/libts)
+version_semver_read(FILE "${CMAKE_CURRENT_LIST_DIR}/version.txt" MAJOR _major MINOR _minor PATCH _patch)
+set(_verstring "${_major}.${_minor}.${_patch}")
+
+find_package(libts "${_verstring}" QUIET PATHS ${CMAKE_CURRENT_BINARY_DIR}/libts_install/${TS_ENV}/lib/cmake/libts)
if(NOT libts_FOUND)
if (CFG_FORCE_PREBUILT_LIBTS)
string(CONCAT _msg "find_package() failed to find the \"libts\" package. Please pass -Dlibts_ROOT=<path> or"
@@ -59,7 +62,7 @@ if(NOT libts_FOUND)
install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/libts/cmake_install.cmake)
- find_package(libts "1.0.0" QUIET REQUIRED PATHS ${CMAKE_CURRENT_BINARY_DIR}/libts_install/${TS_ENV}/lib/cmake/libts)
+ find_package(libts "${_verstring}" QUIET REQUIRED PATHS ${CMAKE_CURRENT_BINARY_DIR}/libts_install/${TS_ENV}/lib/cmake/libts)
else()
message(STATUS "Using prebuilt libts from ${libts_DIR}")
endif()