commit acba69ed76c01fbbb7fd0b2d533a301923f14fd6
author David Hu <david.hu@arm.com> Fri Sep 10 15:36:48 2021 +0800
committer David Hu <david.hu@arm.com> Sat Sep 11 21:10:34 2021 +0800
tree 1aa0100a6e758d3a30b0344a3083f55904252e90
parent 1a74bc5e07529d78c1bd816d51f61ec4385ce3fe

App: Minor fix of include header file

Refine the header files included in main_ns.c
 - tfm_integ_test.h is included in main_ns.c when NS or Secure test is
   enabled.
 - test_framework_integ_test.h is removed from main_ns.c.

Simplfy build system accordingly.

Signed-off-by: David Hu <david.hu@arm.com>
Change-Id: I7a4c09ee149aae1381c1730622f8ae4ab9bc1508

app/CMakeLists.txt

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index db7b26a..2413e47 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -213,13 +213,10 @@
 )
 
 target_link_libraries(tfm_ns_integration_test
-    PUBLIC
-        $<$<BOOL:${TEST_FRAMEWORK_NS}>:tfm_ns_tests>
-        tfm_test_framework_ns
     PRIVATE
-        tfm_ns_interface
-        tfm_api_ns
-        CMSIS_5_tfm_ns
+        $<$<BOOL:${TEST_FRAMEWORK_NS}>:tfm_ns_tests>
+        $<$<BOOL:${TEST_FRAMEWORK_S}>:tfm_ns_interface>
+        $<$<BOOL:${TEST_FRAMEWORK_S}>:tfm_api_ns>
 )
 
 target_compile_definitions(tfm_ns_integration_test