move ACN to a submodule

platform/qt/CMakeLists.txt

@@ -21,6 +21,9 @@ target_sources(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
         Qt::Network
+        LCP_esta_acn_rlp
+        LCP_esta_acn_sdt
+        LCP_esta_acn_dmp
         LCP_esta_sacn
     )
 

protocol/CMakeLists.txt

@@ -16,15 +16,13 @@ endif()
 add_compile_definitions(BUILT_WITH_CMAKE)
 configure_file(config.h.in config.h)
 
-add_library(${PROJECT_NAME} SHARED)
-# E1.17
-include(acn/CMakeLists.txt)
+#add_library(${PROJECT_NAME} SHARED)
 # E1.20
-include(rdm/CMakeLists.txt)
+#include(rdm/CMakeLists.txt)
 # E1.33
-include(rdmnet/CMakeLists.txt)
+#include(rdmnet/CMakeLists.txt)
 # E1.56
-include(otp/CMakeLists.txt)
+#include(otp/CMakeLists.txt)
 
 
 # Entertainment Services and Technology Association
@@ -36,14 +34,15 @@ add_subdirectory(ietf)
 # Artistic License
 add_subdirectory(artistic)
 
-target_link_libraries(${PROJECT_NAME}
-    PUBLIC
-        LCP_ietf_uuid
-        LCP_esta_dmx
-    )
+#target_link_libraries(${PROJECT_NAME}
+#    PUBLIC
+#        LCP_ietf_uuid
+#        LCP_esta_acn
+#        LCP_esta_dmx
+#    )
 
-set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
-set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+#set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+#set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
 
-target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
-target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+#target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+#target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

protocol/acn/CMakeLists.txt

@@ -1,13 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        acn/component.h
-    PRIVATE
-        acn/pdu-stream.cpp
-        acn/pdu-stream.h
-        acn/pdu.cpp
-        acn/pdu.h
-    )
-
-include(dmp/CMakeLists.txt)
-include(rlp/CMakeLists.txt)
-include(sdt/CMakeLists.txt)

protocol/artistic/artnet/CMakeLists.txt

@@ -23,7 +23,8 @@ target_sources(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
-        LCP
+        LCP_esta_acn
+        LCP_esta_dmx
     )
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})

protocol/artistic/artnet/packet.cpp

@@ -23,7 +23,7 @@
   */
 
 #include "packet.h"
-#include "esta/dmx/dmx.h"
+#include "dmx.h"
 #include <sstream>
 
 namespace ARTNET {

protocol/artistic/artnet/packet.h

@@ -25,8 +25,8 @@
 
 #include "artnet.h"
 #include "config.h"
-#include "acn/pdu-stream.h"
-#include "rdm/uid.h"
+#include "pdu-stream.h"
+#include "../../rdm/uid.h"
 #include <vector>
 
 namespace ARTNET {

protocol/dmp/CMakeLists.txt

@@ -1,14 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        dmp/appliance.h
-        dmp/controller.h
-        dmp/device.h
-        dmp/event.h
-    PRIVATE
-        dmp/appliance.cpp
-        dmp/controller.cpp
-        dmp/device.cpp
-        dmp/dmp.cpp
-        dmp/dmp.h
-        dmp/event.cpp
-    )

protocol/esta/CMakeLists.txt

@@ -2,5 +2,7 @@ project(${PROJECT_NAME}_esta)
 
 # E1.11
 add_subdirectory(dmx)
+# E1.17
+add_subdirectory(acn)
 # E1.31
 add_subdirectory(sacn)

protocol/esta/acn/CMakeLists.txt

@@ -0,0 +1,28 @@
+project(${PROJECT_NAME}_acn VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        component.h
+    PRIVATE
+        pdu-stream.cpp
+        pdu-stream.h
+        pdu.cpp
+        pdu.h
+    )
+
+add_subdirectory(dmp)
+add_subdirectory(rlp)
+add_subdirectory(sdt)
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_ietf_uuid
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

protocol/esta/acn/dmp/CMakeLists.txt

@@ -0,0 +1,29 @@
+project(${PROJECT_NAME}_dmp VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        appliance.h
+        controller.h
+        device.h
+        event.h
+    PRIVATE
+        appliance.cpp
+        controller.cpp
+        device.cpp
+        dmp.cpp
+        dmp.h
+        event.cpp
+    )
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_esta_acn
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

protocol/esta/acn/dmp/dmp.h

@@ -26,7 +26,7 @@
 #include <cstdint>
 #include <memory>
 #include <vector>
-#include "acn/pdu.h"
+#include "pdu.h"
 
 /**
  *  @brief @cite DMP Architecture for Control Networks – Device Management Protocol

protocol/esta/acn/rlp/CMakeLists.txt

@@ -0,0 +1,27 @@
+project(${PROJECT_NAME}_rlp VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        component.h
+    PRIVATE
+        component.cpp
+        rlp.cpp
+        rlp.h
+        tcp.cpp
+        tcp.h
+        udp.cpp
+        udp.h
+    )
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_esta_acn
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

protocol/esta/acn/rlp/component.h

@@ -23,8 +23,8 @@
 */
 #pragma once
 
-#include "acn/component.h"
-#include "acn/pdu.h"
+#include "../component.h"
+#include "pdu.h"
 #include "rlp.h"
 #include "sdt/udp.h"
 

protocol/esta/acn/rlp/rlp.h

@@ -25,8 +25,8 @@
 
 #include <cstdint>
 #include <memory>
-#include "acn/pdu.h"
-#include "uuid/uuid.h"
+#include "pdu.h"
+#include "uuid.h"
 
 /**
  * @brief @cite ACN 2.3.2 The Root Layer Protocol

protocol/esta/acn/rlp/tcp.h

@@ -25,7 +25,7 @@
 
 #include <cstdint>
 #include "rlp.h"
-#include "acn/pdu.h"
+#include "pdu.h"
 
 // EPI 33. ACN Root Layer Protocol Operation on TCP
 

protocol/esta/acn/rlp/udp.h

@@ -24,7 +24,7 @@
 #pragma once
 
 #include "rlp.h"
-#include "acn/pdu.h"
+#include "pdu.h"
 
 // ACN EPI 17. ACN Root Layer Protocol Operation on UDP
 

protocol/esta/acn/sdt/CMakeLists.txt

@@ -0,0 +1,33 @@
+project(${PROJECT_NAME}_sdt VERSION 0.3.1 LANGUAGES CXX)
+
+add_library(${PROJECT_NAME} SHARED)
+
+target_sources(${PROJECT_NAME}
+    PUBLIC
+        leader.h
+        member.h
+    PRIVATE
+        channel.cpp
+        channel.h
+        leader.cpp
+        member.cpp
+        identity.cpp
+        identity.h
+        sdt.cpp
+        sdt.h
+        session.cpp
+        session.h
+        udp.cpp
+        udp.h
+    )
+
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        LCP_esta_acn_rlp
+    )
+
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

protocol/esta/acn/sdt/channel.h

@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "acn/component.h"
+#include "../component.h"
 
 #include <memory>
 

protocol/esta/acn/sdt/sdt.h

@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "acn/pdu.h"
+#include "pdu.h"
 #include "udp.h"  // EPI 18
 
 /**

protocol/esta/acn/sdt/udp.h

@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "acn/pdu-stream.h"
+#include "pdu-stream.h"
 #include <cstdint>
 
 // ACN EPI 18 - Operation of SDT on UDP Networks

protocol/esta/sacn/CMakeLists.txt

@@ -24,7 +24,8 @@ target_sources(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
     PUBLIC
-        LCP
+        LCP_esta_acn
+        LCP_esta_acn_dmp
         LCP_esta_dmx
     )
 

protocol/esta/sacn/data.cpp

@@ -22,7 +22,7 @@
   SOFTWARE.
 */
 
-#include "dmp/dmp.h"
+#include "dmp.h"
 #include "data.h"
 #include "sacn.h"
 

protocol/esta/sacn/data.h

@@ -23,7 +23,7 @@
 */
 #pragma once
 
-#include "acn/pdu.h"
+#include "pdu.h"
 
 /**
  * @brief \cite sACN 1.4 Classes of Data Appropriate for Transmission

protocol/esta/sacn/extended.h

@@ -23,8 +23,8 @@
 */
 #pragma once
 
-#include "acn/pdu.h"
-#include "uuid/uuid.h"
+#include "pdu.h"
+#include "uuid.h"
 
 /**
  * @brief both Discovery and Syncronization

protocol/esta/sacn/receiver.cpp

@@ -22,7 +22,7 @@
   SOFTWARE.
 */
 
-#include "acn/pdu.h"
+#include "pdu.h"
 #include "receiver.h"
 
 namespace sACN {

protocol/esta/sacn/universe.h

@@ -25,7 +25,7 @@
 
 #include "data.h"
 #include "dmp/dmp.h"
-#include "esta/dmx/universe.h"
+#include "../dmx/universe.h"
 #include "sacn.h"
 
 #include <cstdint>

protocol/rlp/CMakeLists.txt

@@ -1,12 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        rlp/component.h
-    PRIVATE
-        rlp/component.cpp
-        rlp/rlp.cpp
-        rlp/rlp.h
-        rlp/tcp.cpp
-        rlp/tcp.h
-        rlp/udp.cpp
-        rlp/udp.h
-    )

protocol/sdt/CMakeLists.txt

@@ -1,18 +0,0 @@
-target_sources(${PROJECT_NAME}
-    PUBLIC
-        sdt/leader.h
-        sdt/member.h
-    PRIVATE
-        sdt/channel.cpp
-        sdt/channel.h
-        sdt/leader.cpp
-        sdt/member.cpp
-        sdt/identity.cpp
-        sdt/identity.h
-        sdt/sdt.cpp
-        sdt/sdt.h
-        sdt/session.cpp
-        sdt/session.h
-        sdt/udp.cpp
-        sdt/udp.h
-    )

test/CMakeLists.txt

@@ -14,6 +14,10 @@ if (GTest_FOUND)
         PRIVATE
             GTest::gtest
             LCP_ietf_uuid
+            LCP_esta_acn
+            LCP_esta_acn_rlp
+            LCP_esta_acn_sdt
+            LCP_esta_acn_dmp
             LCP_esta_sacn
         )
     target_include_directories(${PROJECT_NAME}