Fix some Windows build errors:

[platform/upstream/armnn.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54376b6..bf9f1e7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,6 @@ list(APPEND armnnUtils_sources
     src/armnnUtils/TensorIOUtils.hpp
     src/armnnUtils/TensorUtils.cpp
     src/armnnUtils/Transpose.cpp
-    src/armnnUtils/NetworkSockets.hpp
-    src/armnnUtils/NetworkSockets.cpp
     )
 
 add_library_ex(armnnUtils STATIC ${armnnUtils_sources})
@@ -252,8 +250,11 @@ list(APPEND armnn_sources
     include/armnn/utility/NumericCast.hpp
     include/armnn/utility/PolymorphicDowncast.hpp
     include/armnn/utility/StringUtils.hpp
+    profiling/common/include/Packet.hpp
     profiling/common/include/ProfilingException.hpp
     profiling/common/include/SocketConnectionException.hpp
+    profiling/common/include/Constants.hpp
+    profiling/common/src/NetworkSockets.cpp
     src/armnn/layers/LayerCloneBase.hpp
     src/armnn/layers/LayerWithParameters.hpp
     src/armnn/layers/ActivationLayer.hpp
@@ -507,7 +508,6 @@ list(APPEND armnn_sources
     src/profiling/LabelsAndEventClasses.cpp
     src/profiling/LabelsAndEventClasses.hpp
     src/profiling/NullProfilingConnection.hpp
-    src/profiling/Packet.hpp
     src/profiling/PacketBuffer.cpp
     src/profiling/PacketBuffer.hpp
     src/profiling/PacketVersionResolver.cpp
@@ -573,6 +573,7 @@ target_include_directories(armnn PRIVATE src/armnn)
 target_include_directories(armnn PRIVATE src/armnnUtils)
 target_include_directories(armnn PRIVATE src/backends)
 target_include_directories(armnn PRIVATE src/profiling)
+target_include_directories(armnn PRIVATE profiling/common/include)
 
 target_link_libraries(armnn armnnUtils)
 
@@ -905,6 +906,12 @@ if(BUILD_UNIT_TESTS)
              )
     endif()
 
+    if(BUILD_BASE_PIPE_SERVER)
+        list(APPEND unittest_sources
+                profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp
+                )
+    endif()
+
     foreach(lib ${armnnUnitTestLibraries})
         message(STATUS "Adding object library dependency to UnitTests: ${lib}")
         list(APPEND unittest_sources $<TARGET_OBJECTS:${lib}>)
@@ -915,7 +922,6 @@ if(BUILD_UNIT_TESTS)
     target_include_directories(UnitTests PRIVATE src/armnnUtils)
     target_include_directories(UnitTests PRIVATE src/backends)
     target_include_directories(UnitTests PRIVATE src/profiling)
-    target_include_directories(UnitTests PRIVATE src/timelineDecoder)
 
     if(VALGRIND_FOUND)
         if(HEAP_PROFILING OR LEAK_CHECKING)
@@ -970,6 +976,10 @@ if(BUILD_UNIT_TESTS)
         target_link_libraries(UnitTests armnnOnnxParser)
     endif()
 
+    if(BUILD_BASE_PIPE_SERVER)
+        target_link_libraries(UnitTests armnnBasePipeServer)
+    endif()
+
     addDllCopyCommands(UnitTests)
 endif()
 
@@ -1008,10 +1018,22 @@ if (BUILD_ARMNN_SERIALIZER AND (BUILD_TF_PARSER OR BUILD_TF_LITE_PARSER OR BUILD
     addDllCopyCommands(ArmnnConverter)
   endif()
 
+if(BUILD_BASE_PIPE_SERVER)
+    add_subdirectory(profiling/server/src/basePipeServer)
+endif()
+
 if(BUILD_TIMELINE_DECODER)
     add_subdirectory(src/timelineDecoder)
 endif()
 
+if(BUILD_GATORD_MOCK AND NOT BUILD_BASE_PIPE_SERVER)
+    message(ERROR, "In order to build GatordMock you must set BUILD_BASE_PIPE_SERVER = YES")
+endif()
+
+if(BUILD_GATORD_MOCK AND NOT BUILD_TIMELINE_DECODER)
+    message(ERROR, "In order to build GatordMock you must set BUILD_TIMELINE_DECODER = YES")
+endif()
+
 if(BUILD_GATORD_MOCK)
     set(gatord_mock_sources)
     list(APPEND gatord_mock_sources
@@ -1030,23 +1052,36 @@ if(BUILD_GATORD_MOCK)
         tests/profiling/gatordmock/StubCommandHandler.hpp
         )
 
-    include_directories(src/profiling tests/profiling tests/profiling/gatordmock src/timelineDecoder)
-
     add_library_ex(gatordMockService STATIC ${gatord_mock_sources})
-    target_include_directories(gatordMockService PRIVATE src/armnnUtils)
+
+    target_include_directories(gatordMockService PRIVATE profiling/common/include
+                                                         profiling/server/src/basePipeServer
+                                                         src/armnnUtils
+                                                         src/profiling
+                                                         src/timelineDecoder)
+
+    if(BUILD_UNIT_TESTS)
+        target_include_directories(UnitTests PRIVATE tests/profiling/gatordmock)
+        target_include_directories(UnitTests PRIVATE src/backends/backendsCommon/test)
+    endif()
 
     add_executable_ex(GatordMock tests/profiling/gatordmock/GatordMockMain.cpp)
-    target_include_directories(GatordMock PRIVATE src/armnnUtils)
+
+    target_include_directories(GatordMock PRIVATE profiling/common/include
+                                                  profiling/server/src/basePipeServer
+                                                  src/profiling
+                                                  src/timelineDecoder)
 
     target_link_libraries(GatordMock
-        armnn
-        timelineDecoder
-        gatordMockService
-        ${Boost_PROGRAM_OPTIONS_LIBRARY}
-        ${Boost_SYSTEM_LIBRARY})
+                          armnn
+                          armnnBasePipeServer
+                          timelineDecoder
+                          gatordMockService
+                          ${Boost_PROGRAM_OPTIONS_LIBRARY}
+                          ${Boost_SYSTEM_LIBRARY})
 
     if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
-        target_link_libraries(GatordMock pthread)
+        target_link_libraries(GatordMock ${CMAKE_THREAD_LIBS_INIT})
     endif()
 
 endif()