diff options
| author | Rob Hughes <robert.hughes@arm.com> | 2020-05-20 13:11:37 +0100 |
|---|---|---|
| committer | Rob Hughes <robert.hughes@arm.com> | 2020-06-02 14:55:00 +0000 |
| commit | bc873d2dac4666a86e4844985199dfd90e67be5b (patch) | |
| tree | 478688dc9a28b497a13ce7b65ef786d1d8b4547b /profiling | |
| parent | bb46dde88befe14583eaac83f65775a7543d4586 (diff) | |
| download | armnn-bc873d2dac4666a86e4844985199dfd90e67be5b.tar.gz | |
Tidy up uses of Windows.h by adding WindowsWrapper.hpp
This header brings in the Win32 API header, with some small modifications
applied to prevent clashes with our code. This means those modifications
don't need to be made in each place that we bring in Windows.h
Change-Id: Ie817c7a167eccbe1ac6a49d3fc940eef8b2f534d
Signed-off-by: Robert Hughes <robert.hughes@arm.com>
Diffstat (limited to 'profiling')
| -rw-r--r-- | profiling/common/include/NetworkSockets.hpp | 1 | ||||
| -rw-r--r-- | profiling/server/src/basePipeServer/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/profiling/common/include/NetworkSockets.hpp b/profiling/common/include/NetworkSockets.hpp index 77507644e6..de20ff14e2 100644 --- a/profiling/common/include/NetworkSockets.hpp +++ b/profiling/common/include/NetworkSockets.hpp @@ -16,6 +16,7 @@ #include <sys/socket.h> #include <sys/un.h> #elif defined(_MSC_VER) +#include <WindowsWrapper.hpp> #include <winsock2.h> #include <afunix.h> #endif diff --git a/profiling/server/src/basePipeServer/CMakeLists.txt b/profiling/server/src/basePipeServer/CMakeLists.txt index a2567cede6..56ef4548ec 100644 --- a/profiling/server/src/basePipeServer/CMakeLists.txt +++ b/profiling/server/src/basePipeServer/CMakeLists.txt @@ -24,6 +24,8 @@ if(BUILD_BASE_PIPE_SERVER) set_target_properties(armnnBasePipeServer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) + target_include_directories(armnnBasePipeServer PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils) + target_link_libraries(armnnBasePipeServer armnn) if ("${CMAKE_SYSTEM_NAME}" STREQUAL Windows) target_link_libraries(armnnBasePipeServer Ws2_32.lib) |