aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGyorgy Szing <Gyorgy.Szing@arm.com>2022-10-21 08:24:26 +0200
committerGyorgy Szing <Gyorgy.Szing@arm.com>2022-10-21 09:31:45 +0200
commit9ac238c688e78c0424d4a93c517e91b21b428d16 (patch)
tree919f9e597e2a6df5ec20dfd04fed36783b5a0504
parentae4f4a6d1317f0d14519ac454d16639b4db6f08b (diff)
downloadtrusted-services-9ac238c688e78c0424d4a93c517e91b21b428d16.tar.gz
Fix: unused variables in psa_arch_tests.cmake
272f9c1c accidentally reintroduced deleted configuration variables PSA_ARCH_TESTS_INSTALL_PATH and PSA_ARCH_TESTS_PACKAGE_PATH. This change fixes this and removes the variables. Change-Id: Ica418ebbb58f19c23312eca215cf0db9f712f959 Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
-rw-r--r--external/psa_arch_tests/psa-arch-test-init-cache.cmake.in1
-rw-r--r--external/psa_arch_tests/psa_arch_tests.cmake2
2 files changed, 0 insertions, 3 deletions
diff --git a/external/psa_arch_tests/psa-arch-test-init-cache.cmake.in b/external/psa_arch_tests/psa-arch-test-init-cache.cmake.in
index cccc78a2f..5e227a503 100644
--- a/external/psa_arch_tests/psa-arch-test-init-cache.cmake.in
+++ b/external/psa_arch_tests/psa-arch-test-init-cache.cmake.in
@@ -5,7 +5,6 @@
#
#-------------------------------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX "@PSA_ARCH_TESTS_INSTALL_PATH@" CACHE STRING "")
set(CMAKE_TOOLCHAIN_FILE "@TS_EXTERNAL_LIB_TOOLCHAIN_FILE@" CACHE STRING "")
set(TOOLCHAIN INHERIT CACHE STRING "")
diff --git a/external/psa_arch_tests/psa_arch_tests.cmake b/external/psa_arch_tests/psa_arch_tests.cmake
index a8b77a1fc..0c1992a6e 100644
--- a/external/psa_arch_tests/psa_arch_tests.cmake
+++ b/external/psa_arch_tests/psa_arch_tests.cmake
@@ -7,8 +7,6 @@
set(PSA_ARCH_TESTS_URL "https://github.com/ARM-software/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL")
set(PSA_ARCH_TESTS_REFSPEC "451aa087a40d02c7d04778235014c5619d126471" CACHE STRING "A tested SHA from main having the AEAD fixes.")
-set(PSA_ARCH_TESTS_INSTALL_PATH "${CMAKE_CURRENT_BINARY_DIR}/psa-arch-tests_install" CACHE PATH "psa-arch-tests installation directory")
-set(PSA_ARCH_TESTS_PACKAGE_PATH "${PSA_ARCH_TESTS_INSTALL_PATH}/libpsa-arch-tests/cmake" CACHE PATH "psa-arch-tests CMake package directory")
set(PSA_ARCH_TESTS_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/psa_arch_tests-src" CACHE PATH "psa-arch-tests source.")
set(GIT_OPTIONS