commit 805db7be1f21d758b680b4064f4665307a29e19e
author Jamie Fox <jamie.fox@arm.com> Wed Nov 01 18:46:58 2023 +0000
committer David Hu <david.hu@arm.com> Tue Nov 07 11:26:57 2023 +0100
tree cf1d7c903b5486e5aaffb7b4dc9de0e827c86359
parent 1c7376c9af191606fe8d9155b03dfd885d92f105

Build: Make changes for split build

The TFM_INSTALL_PATH variable is replaced in the split build.

Signed-off-by: Jamie Fox <jamie.fox@arm.com>
Change-Id: I32487effb344873f13c8a4c10c70e98b1552f9c9

partitions/delegated_attestation/CMakeLists.txt

diff --git a/partitions/delegated_attestation/CMakeLists.txt b/partitions/delegated_attestation/CMakeLists.txt
index 1d541ab..2c267ab 100644
--- a/partitions/delegated_attestation/CMakeLists.txt
+++ b/partitions/delegated_attestation/CMakeLists.txt
@@ -97,9 +97,6 @@
         TFM_PARTITION_DELEGATED_ATTESTATION
 )
 
-set(INSTALL_INTERFACE_SRC_DIR    ${TFM_INSTALL_PATH}/interface/src)
-set(INSTALL_INTERFACE_INC_DIR    ${TFM_INSTALL_PATH}/interface/include)
-
 install(FILES       ${INTERFACE_SRC_DIR}/tfm_delegated_attestation_api.c
         DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 

partitions/dice_protection_environment/CMakeLists.txt

diff --git a/partitions/dice_protection_environment/CMakeLists.txt b/partitions/dice_protection_environment/CMakeLists.txt
index 01f6ff5..d791898 100644
--- a/partitions/dice_protection_environment/CMakeLists.txt
+++ b/partitions/dice_protection_environment/CMakeLists.txt
@@ -113,8 +113,8 @@
 
 install(FILES       ${CMAKE_CURRENT_SOURCE_DIR}/interface/src/dpe_cmd_encode.c
                     ${CMAKE_CURRENT_SOURCE_DIR}/interface/src/dpe_client.c
-        DESTINATION ${TFM_INSTALL_PATH}/interface/src)
+        DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 
 install(FILES       ${CMAKE_CURRENT_SOURCE_DIR}/interface/include/dice_protection_environment.h
                     ${CMAKE_CURRENT_SOURCE_DIR}/interface/include/dpe_client.h
-        DESTINATION ${TFM_INSTALL_PATH}/interface/include)
+        DESTINATION ${INSTALL_INTERFACE_INC_DIR})

partitions/measured_boot/CMakeLists.txt

diff --git a/partitions/measured_boot/CMakeLists.txt b/partitions/measured_boot/CMakeLists.txt
index 1964035..b6ab271 100644
--- a/partitions/measured_boot/CMakeLists.txt
+++ b/partitions/measured_boot/CMakeLists.txt
@@ -112,9 +112,6 @@
         MEASUREMENT_HASH_ALGO_NAME="${MEASUREMENT_HASH_ALGO_NAME}"
 )
 
-set(INSTALL_INTERFACE_SRC_DIR    ${TFM_INSTALL_PATH}/interface/src)
-set(INSTALL_INTERFACE_INC_DIR    ${TFM_INSTALL_PATH}/interface/include)
-
 install(FILES       ${INTERFACE_SRC_DIR}/measured_boot_api.c
         DESTINATION ${INSTALL_INTERFACE_SRC_DIR})