cleanup the the linking and including hierarchy

2022-11-30 09:52:25 -05:00 · 2022-11-30 09:52:25 -05:00 · 0ba1ecc9ac
parent 32557b5c31
commit 0ba1ecc9ac
26 changed files with 37 additions and 38 deletions
--- a/protocol/esta/acn/dmp/CMakeLists.txt
+++ b/protocol/esta/acn/dmp/CMakeLists.txt
@ -19,6 +19,7 @@ target_sources(${PROJECT_NAME}

 target_link_libraries(${PROJECT_NAME}
    PUBLIC
+        LCP_acn_pdu
        LCP_acn_sdt
        LCP_uuid
    )
--- a/protocol/esta/acn/dmp/appliance.h
+++ b/protocol/esta/acn/dmp/appliance.h
@ -23,8 +23,8 @@
 */
 #pragma once

-#include "../sdt/member.h"
-#include "device.h"
+#include "sdt/member.h"
+#include "dmp/device.h"
 #include "uuid.h"

 namespace ACN::DMP {
--- a/protocol/esta/acn/dmp/controller.h
+++ b/protocol/esta/acn/dmp/controller.h
@ -23,7 +23,7 @@
 */
 #pragma once

-#include "leader.h"
+#include "sdt/leader.h"

 namespace ACN::DMP {

--- a/protocol/esta/acn/dmp/dmp.h
+++ b/protocol/esta/acn/dmp/dmp.h
@ -26,7 +26,7 @@
 #include <cstdint>
 #include <memory>
 #include <vector>
-#include "../pdu.h"
+#include "pdu.h"

 /**
 *  @brief @cite DMP Architecture for Control Networks – Device Management Protocol
--- a/protocol/esta/acn/rlp/CMakeLists.txt
+++ b/protocol/esta/acn/rlp/CMakeLists.txt
@ -17,6 +17,7 @@ target_sources(${PROJECT_NAME}

 target_link_libraries(${PROJECT_NAME}
    PUBLIC
+        LCP_acn_pdu
        LCP_uuid
    )

--- a/protocol/esta/acn/rlp/component.cpp
+++ b/protocol/esta/acn/rlp/component.cpp
@ -23,7 +23,7 @@
 */

 #include "component.h"
-#include "../sdt/sdt.h"
+#include "sdt/sdt.h"
 #include "tcp.h"
 #include "udp.h"

--- a/protocol/esta/acn/rlp/component.h
+++ b/protocol/esta/acn/rlp/component.h
@ -24,9 +24,9 @@
 #pragma once

 #include "../component.h"
-#include "../pdu.h"
+#include "pdu.h"
 #include "rlp.h"
-#include "../sdt/udp.h"
+#include "sdt/udp.h"

 #include <map>
 #include <memory>
--- a/protocol/esta/acn/rlp/rlp.h
+++ b/protocol/esta/acn/rlp/rlp.h
@ -25,7 +25,7 @@

 #include <cstdint>
 #include <memory>
-#include "../pdu.h"
+#include "pdu.h"
 #include "uuid.h"

 /**
--- a/protocol/esta/acn/rlp/tcp.h
+++ b/protocol/esta/acn/rlp/tcp.h
@ -25,7 +25,7 @@

 #include <cstdint>
 #include "rlp.h"
-#include "../pdu.h"
+#include "pdu.h"

 // EPI 33. ACN Root Layer Protocol Operation on TCP

--- a/protocol/esta/acn/sdt/CMakeLists.txt
+++ b/protocol/esta/acn/sdt/CMakeLists.txt
@ -6,6 +6,8 @@ target_sources(${PROJECT_NAME}
    PUBLIC
        leader.h
        member.h
+        sdt.h
+        udp.h
    PRIVATE
        channel.cpp
        channel.h
@ -14,11 +16,9 @@ target_sources(${PROJECT_NAME}
        identity.cpp
        identity.h
        sdt.cpp
-        sdt.h
        session.cpp
        session.h
        udp.cpp
-        udp.h
    )

 target_link_libraries(${PROJECT_NAME}
--- a/protocol/esta/acn/sdt/channel.cpp
+++ b/protocol/esta/acn/sdt/channel.cpp
@ -31,9 +31,10 @@ namespace ACN::SDT {
 * @param owner
 * @param direction
 */
-Channel::Channel(std::shared_ptr<Component> owner, Direction direction) {
-  owner_ = owner;
-  direction_ = direction;
+Channel::Channel(std::shared_ptr<ACN::RLP::Component> owner, Direction direction)
+    : owner_(owner)
+    , direction_(direction)
+{
 }


--- a/protocol/esta/acn/sdt/channel.h
+++ b/protocol/esta/acn/sdt/channel.h
@ -23,7 +23,7 @@
 */
 #pragma once

-#include "../component.h"
+#include "rlp/component.h"

 #include <memory>

@ -47,11 +47,11 @@ enum Direction {
 */
 class Channel {
 public:
-  Channel(std::shared_ptr<Component>, Direction);
+  Channel(std::shared_ptr<ACN::RLP::Component>, Direction);
  ~Channel();

 private:
-  std::shared_ptr<Component> owner_;
+  std::shared_ptr<ACN::RLP::Component> owner_;
  Direction direction_ = internal;
 };

--- a/protocol/esta/acn/sdt/leader.h
+++ b/protocol/esta/acn/sdt/leader.h
@ -23,8 +23,8 @@
 */
 #pragma once

-#include "session.h"
-#include "../rlp/component.h"
+#include "sdt/session.h"
+#include "rlp/component.h"

 #include <vector>
 #include <memory>
--- a/protocol/esta/acn/sdt/member.h
+++ b/protocol/esta/acn/sdt/member.h
@ -23,7 +23,7 @@
 */
 #pragma once

-#include "../rlp/component.h"
+#include "rlp/component.h"

 namespace ACN::SDT {

--- a/protocol/esta/acn/sdt/sdt.h
+++ b/protocol/esta/acn/sdt/sdt.h
@ -23,8 +23,8 @@
 */
 #pragma once

-#include "../pdu.h"
-#include "udp.h"  // EPI 18
+#include "pdu.h"
+#include "sdt/udp.h"  // EPI 18

 /**
 * @brief @cite SDT ANSI E1.17- 2015, Architecture for Control Networks–
--- a/protocol/esta/acn/sdt/udp.h
+++ b/protocol/esta/acn/sdt/udp.h
@ -23,7 +23,7 @@
 */
 #pragma once

-#include "../pdu-stream.h"
+#include "pdu-stream.h"
 #include <cstdint>

 // ACN EPI 18 - Operation of SDT on UDP Networks
--- a/protocol/esta/otp/CMakeLists.txt
+++ b/protocol/esta/otp/CMakeLists.txt
@ -17,7 +17,7 @@ target_sources(${PROJECT_NAME}

 target_link_libraries(${PROJECT_NAME}
    PUBLIC
-        LCP_acn
+        LCP_acn_pdu
    )

 set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
--- a/protocol/esta/otp/pdu.h
+++ b/protocol/esta/otp/pdu.h
@ -23,8 +23,7 @@
 */
 #pragma once

-#include "../acn/pdu-stream.h"
-
+#include "pdu-stream.h"
 #include <vector>

 namespace OTP {
--- a/protocol/esta/otp/transform.h
+++ b/protocol/esta/otp/transform.h
@ -24,7 +24,6 @@
 #pragma once

 #include "pdu.h"
-
 #include <chrono>

 namespace OTP::Transform {
--- a/protocol/esta/rdmnet/CMakeLists.txt
+++ b/protocol/esta/rdmnet/CMakeLists.txt
@ -22,7 +22,7 @@ target_sources(${PROJECT_NAME}

 target_link_libraries(${PROJECT_NAME}
    PUBLIC
-        LCP_acn
+        LCP_acn_pdu
        LCP_rdm
        LCP_rdmnet_ept
        LCP_rdmnet_llrp
--- a/protocol/esta/rdmnet/llrp/CMakeLists.txt
+++ b/protocol/esta/rdmnet/llrp/CMakeLists.txt
@ -15,7 +15,7 @@ target_sources(${PROJECT_NAME}

 target_link_libraries(${PROJECT_NAME}
    PUBLIC
-        LCP_acn
+        LCP_acn_rlp
        LCP_rdm
        LCP_rdmnet_rpt
    )
--- a/protocol/esta/rdmnet/llrp/manager.h
+++ b/protocol/esta/rdmnet/llrp/manager.h
@ -24,7 +24,7 @@
 #pragma once

 #include "llrp.h"
-#include "rlp/component.h"
+#include "component.h"

 namespace RDMnet::LLRP {

--- a/protocol/esta/sacn/CMakeLists.txt
+++ b/protocol/esta/sacn/CMakeLists.txt
@ -24,7 +24,9 @@ target_sources(${PROJECT_NAME}

 target_link_libraries(${PROJECT_NAME}
    PUBLIC
-        LCP_acn
+        LCP_acn_pdu
+        LCP_acn_rlp
+        LCP_acn_dmp
        LCP_dmx
    )

@ -33,6 +35,3 @@ 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})
-
-
-
--- a/protocol/esta/sacn/arbitratinguniverse.cpp
+++ b/protocol/esta/sacn/arbitratinguniverse.cpp
@ -216,7 +216,7 @@ std::shared_ptr<DATA::data_header> ArbitratingUniverse::provenance()
 * @param src
 */
 void ArbitratingUniverse::set(std::shared_ptr<ACN::DMP::Pdu> pdu,
-                             std::shared_ptr<DATA::data_header> src)
+                              std::shared_ptr<DATA::data_header> src)
 {
  if (expectedUniverse != 0 &&
      src->universe != expectedUniverse)
--- a/protocol/esta/sacn/sacn.h
+++ b/protocol/esta/sacn/sacn.h
@ -23,7 +23,7 @@
 */
 #pragma once

-#include "sdt/sdt.h"
+#include "../acn/sdt/sdt.h"

 #include <cstdint>

--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)

-project(Tests LANGUAGES CXX)
+project(tests LANGUAGES CXX)

 set(CMAKE_AUTOUIC OFF)
 set(CMAKE_AUTOMOC OFF)
@ -14,7 +14,6 @@ if (GTest_FOUND)
        PRIVATE
            GTest::gtest
            LCP_uuid
-            LCP_acn
            LCP_sacn
        )
    target_include_directories(${PROJECT_NAME}