From 0c8cb99db6dd8b1ea073ef7227b2872a3cb0b269 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Thu, 7 May 2020 10:38:15 +0100 Subject: IVGCVSW-4731 Move Packet.hpp to profiling/common/include * Refactor profiling cmake to fix inconsistencies/issues with includes Signed-off-by: Finn Williams Change-Id: I0836762d4c72e25754a28162ec54c8e332422a02 --- profiling/server/src/basePipeServer/CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'profiling/server/src/basePipeServer/CMakeLists.txt') diff --git a/profiling/server/src/basePipeServer/CMakeLists.txt b/profiling/server/src/basePipeServer/CMakeLists.txt index e535cf2e66..b2cb82d816 100644 --- a/profiling/server/src/basePipeServer/CMakeLists.txt +++ b/profiling/server/src/basePipeServer/CMakeLists.txt @@ -6,15 +6,20 @@ if(BUILD_BASE_PIPE_SERVER) set(BasePipeServer_sources) list(APPEND BasePipeServer_sources - BasePipeServer.cpp - BasePipeServer.hpp - ConnectionHandler.cpp - ConnectionHandler.hpp - ) + BasePipeServer.cpp + BasePipeServer.hpp + ConnectionHandler.cpp + ConnectionHandler.hpp) - include_directories(src/armnnUtils src/profiling) + include_directories(${PROJECT_SOURCE_DIR}/profiling/common/include) + + if (BUILD_UNIT_TESTS) + target_include_directories(UnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/server/src/basePipeServer) + target_include_directories(UnitTests PUBLIC ${PROJECT_SOURCE_DIR}/profiling/common/include) + endif() add_library_ex(armnnBasePipeServer SHARED ${BasePipeServer_sources}) + set_target_properties(armnnBasePipeServer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) set_target_properties(armnnBasePipeServer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) -- cgit v1.2.1