blob: 5fcbcb0aaa28d18a8066ca9d9bd09314a139e223 [file] [log] [blame]
Antonio de Angelis75024f02024-11-02 22:46:23 +00001From e8150b5c013d01a3ee268e50cd4f83ea86ff7c5b Mon Sep 17 00:00:00 2001
Kevin Peng6eb44182023-11-09 14:42:46 +08002From: Kevin Peng <kevin.peng@arm.com>
3Date: Thu, 9 Nov 2023 14:40:48 +0800
Antonio de Angelis75024f02024-11-02 22:46:23 +00004Subject: [PATCH 3/5] Build: Add manifest tool dependencies
Kevin Peng6eb44182023-11-09 14:42:46 +08005
6Signed-off-by: Kevin Peng <kevin.peng@arm.com>
7---
Kevin Peng31935c82023-11-09 16:20:27 +08008 api-tests/CMakeLists.txt | 3 +++
9 api-tests/val/val_spe.cmake | 6 ++++++
10 2 files changed, 9 insertions(+)
Kevin Peng6eb44182023-11-09 14:42:46 +080011
12diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt
Kevin Peng31935c82023-11-09 16:20:27 +080013index f5e45c1..176978e 100644
Kevin Peng6eb44182023-11-09 14:42:46 +080014--- a/api-tests/CMakeLists.txt
15+++ b/api-tests/CMakeLists.txt
Kevin Peng31935c82023-11-09 16:20:27 +080016@@ -673,6 +673,9 @@ add_dependencies(${PSA_TARGET_GENERATE_DATABASE_POST} ${PSA_TARGET_GENERATE_DATA
Kevin Peng6eb44182023-11-09 14:42:46 +080017 add_dependencies(${PSA_TARGET_PAL_NSPE_LIB} ${PSA_TARGET_GENERATE_DATABASE_POST})
18 add_dependencies(${PSA_TARGET_VAL_NSPE_LIB} ${PSA_TARGET_PAL_NSPE_LIB})
19 add_dependencies(${PSA_TARGET_TEST_COMBINE_LIB} ${PSA_TARGET_VAL_NSPE_LIB})
Kevin Peng31935c82023-11-09 16:20:27 +080020+if(TARGET manifest_tool)
21+ add_dependencies(${PSA_TARGET_TEST_COMBINE_LIB} manifest_tool)
22+endif()
Kevin Peng6eb44182023-11-09 14:42:46 +080023 if(${SUITE} STREQUAL "IPC")
24 add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB} ${PSA_TARGET_TEST_COMBINE_LIB})
25 add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB} ${PSA_TARGET_DRIVER_PARTITION_LIB})
26diff --git a/api-tests/val/val_spe.cmake b/api-tests/val/val_spe.cmake
Kevin Peng31935c82023-11-09 16:20:27 +080027index 37b8888..81f8d6a 100644
Kevin Peng6eb44182023-11-09 14:42:46 +080028--- a/api-tests/val/val_spe.cmake
29+++ b/api-tests/val/val_spe.cmake
Kevin Peng31935c82023-11-09 16:20:27 +080030@@ -53,6 +53,12 @@ add_library(${PSA_TARGET_CLIENT_PARTITION_LIB} STATIC ${PARTITION_IPC_CLIENT_SRC
Kevin Peng6eb44182023-11-09 14:42:46 +080031 # Create Server partition library
32 add_library(${PSA_TARGET_SERVER_PARTITION_LIB} STATIC ${PARTITION_IPC_SERVER_SRC_C_SPE} ${SUITE_SERVER_CC_SRC_SPE})
33
Kevin Peng31935c82023-11-09 16:20:27 +080034+if(TARGET manifest_tool)
35+ add_dependencies(${PSA_TARGET_DRIVER_PARTITION_LIB} manifest_tool)
36+ add_dependencies(${PSA_TARGET_CLIENT_PARTITION_LIB} manifest_tool)
37+ add_dependencies(${PSA_TARGET_SERVER_PARTITION_LIB} manifest_tool)
38+endif()
Kevin Peng6eb44182023-11-09 14:42:46 +080039+
40 target_include_directories(${PSA_TARGET_DRIVER_PARTITION_LIB} PRIVATE
41 ${CMAKE_CURRENT_BINARY_DIR}
42 ${PSA_ROOT_DIR}/val/common
43--
Antonio de Angelis75024f02024-11-02 22:46:23 +0000442.47.0
Kevin Peng6eb44182023-11-09 14:42:46 +080045