diff options
| author | Finn Williams <Finn.Williams@arm.com> | 2020-05-07 10:38:15 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-05-12 22:00:17 +0000 |
| commit | 0c8cb99db6dd8b1ea073ef7227b2872a3cb0b269 (patch) | |
| tree | 3a2301175e09d7e6f2f5feb2d8c6f8a184493b4c /profiling/server | |
| parent | d6cb30e7052891996efa41f608fffe4fa62d2094 (diff) | |
| download | armnn-0c8cb99db6dd8b1ea073ef7227b2872a3cb0b269.tar.gz | |
IVGCVSW-4731 Move Packet.hpp to profiling/common/include
* Refactor profiling cmake to fix inconsistencies/issues with includes
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I0836762d4c72e25754a28162ec54c8e332422a02
Diffstat (limited to 'profiling/server')
3 files changed, 15 insertions, 10 deletions
diff --git a/profiling/server/src/basePipeServer/BasePipeServer.hpp b/profiling/server/src/basePipeServer/BasePipeServer.hpp index 4e6e0c0e4b..bef9d29f44 100644 --- a/profiling/server/src/basePipeServer/BasePipeServer.hpp +++ b/profiling/server/src/basePipeServer/BasePipeServer.hpp @@ -5,9 +5,9 @@ #pragma once -#include "common/include/NetworkSockets.hpp" -#include "../../../../src/profiling/Packet.hpp" -#include "common/include/SocketConnectionException.hpp" +#include <NetworkSockets.hpp> +#include <Packet.hpp> +#include <SocketConnectionException.hpp> #include <string> #include <atomic> 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}) diff --git a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp index c85bbe72d3..c97fecd94d 100644 --- a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp +++ b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "../ConnectionHandler.hpp" +#include <ConnectionHandler.hpp> #include <SocketProfilingConnection.hpp> #include <Processes.hpp> |