move RDM and RDMnet to submodules
This commit is contained in:
parent
3e2d22e77e
commit
3e648dc152
|
@ -17,10 +17,7 @@ add_compile_definitions(BUILT_WITH_CMAKE)
|
|||
configure_file(config.h.in config.h)
|
||||
|
||||
#add_library(${PROJECT_NAME} SHARED)
|
||||
# E1.20
|
||||
#include(rdm/CMakeLists.txt)
|
||||
# E1.33
|
||||
#include(rdmnet/CMakeLists.txt)
|
||||
|
||||
# E1.56
|
||||
#include(otp/CMakeLists.txt)
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include "artnet.h"
|
||||
#include "config.h"
|
||||
#include "pdu-stream.h"
|
||||
#include "../../rdm/uid.h"
|
||||
#include "../../esta/rdm/uid.h"
|
||||
#include <vector>
|
||||
|
||||
namespace ARTNET {
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
ept/client.h
|
||||
PRIVATE
|
||||
ept/broker.cpp
|
||||
ept/broker.h
|
||||
ept/client.cpp
|
||||
ept/ept.cpp
|
||||
ept/ept.h
|
||||
)
|
|
@ -4,5 +4,9 @@ project(${PROJECT_NAME}_esta)
|
|||
add_subdirectory(dmx)
|
||||
# E1.17
|
||||
add_subdirectory(acn)
|
||||
# E1.20
|
||||
add_subdirectory(rdm)
|
||||
# E1.31
|
||||
add_subdirectory(sacn)
|
||||
# E1.33
|
||||
add_subdirectory(rdmnet)
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
project(${PROJECT_NAME}_rdm VERSION 0.3.1 LANGUAGES CXX)
|
||||
configure_file(../../config.h.in config.h)
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED)
|
||||
|
||||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
controller.h
|
||||
device.h
|
||||
message.h
|
||||
parameter.h
|
||||
responder.h
|
||||
sensor.h
|
||||
status.h
|
||||
PRIVATE
|
||||
controller.cpp
|
||||
device.cpp
|
||||
E1.37-1.h
|
||||
E1.37-2.h
|
||||
E1.37-7.h
|
||||
message.cpp
|
||||
parameter.cpp
|
||||
rdm.cpp
|
||||
rdm.h
|
||||
responder.cpp
|
||||
sensor.cpp
|
||||
uid.h
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
LCP_esta_dmx
|
||||
)
|
||||
|
||||
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})
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "esta/dmx/device.h"
|
||||
#include "../dmx/device.h"
|
||||
#include "parameter.h"
|
||||
#include "rdm.h"
|
||||
#include "sensor.h"
|
|
@ -0,0 +1,40 @@
|
|||
project(${PROJECT_NAME}_rdmnet VERSION 0.3.1 LANGUAGES CXX)
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED)
|
||||
|
||||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
broker.h
|
||||
controller.h
|
||||
device.h
|
||||
PRIVATE
|
||||
broker-protocol.cpp
|
||||
broker-protocol.h
|
||||
broker.cpp
|
||||
controller.cpp
|
||||
device.cpp
|
||||
implementation.cpp
|
||||
implementation.h
|
||||
pdu.cpp
|
||||
pdu.h
|
||||
rdmnet.h
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
LCP_esta_acn
|
||||
LCP_esta_rdm
|
||||
LCP_esta_rdmnet_ept
|
||||
LCP_esta_rdmnet_llrp
|
||||
LCP_esta_rdmnet_rpt
|
||||
)
|
||||
|
||||
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})
|
||||
|
||||
add_subdirectory(ept)
|
||||
add_subdirectory(llrp)
|
||||
add_subdirectory(rpt)
|
|
@ -24,8 +24,8 @@
|
|||
#pragma once
|
||||
|
||||
#include "pdu.h"
|
||||
#include "rdm/uid.h"
|
||||
#include "uuid/uuid.h"
|
||||
#include "uid.h"
|
||||
#include "uuid.h"
|
||||
|
||||
namespace RDMnet::BrokerProtocol {
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "implementation.h"
|
||||
#include "rdm/controller.h"
|
||||
#include "../rdm/controller.h"
|
||||
#include "rpt/controller.h"
|
||||
|
||||
namespace RDMnet {
|
|
@ -0,0 +1,27 @@
|
|||
project(${PROJECT_NAME}_ept VERSION 0.3.1 LANGUAGES CXX)
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED)
|
||||
|
||||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
client.h
|
||||
PRIVATE
|
||||
broker.cpp
|
||||
broker.h
|
||||
client.cpp
|
||||
ept.cpp
|
||||
ept.h
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
LCP_ietf_uuid
|
||||
LCP_esta_rdm
|
||||
LCP_esta_rdmnet_rpt
|
||||
)
|
||||
|
||||
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})
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
|
||||
#include "ept.h"
|
||||
#include "rdmnet/rdmnet.h"
|
||||
#include "rpt/rpt.h"
|
||||
#include "../rdmnet.h"
|
||||
#include "rpt.h"
|
||||
|
||||
namespace RDMnet::EPT {
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "rdmnet/pdu.h"
|
||||
#include "uuid/uuid.h"
|
||||
#include "../pdu.h"
|
||||
#include "uuid.h"
|
||||
|
||||
namespace RDMnet::EPT {
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include "ept/client.h"
|
||||
#include "llrp/target.h"
|
||||
#include "rdm/responder.h"
|
||||
#include "responder.h"
|
||||
#include "rlp/component.h"
|
||||
|
||||
namespace RDMnet {
|
|
@ -0,0 +1,28 @@
|
|||
project(${PROJECT_NAME}_llrp VERSION 0.3.1 LANGUAGES CXX)
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED)
|
||||
|
||||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
manager.h
|
||||
PRIVATE
|
||||
llrp.cpp
|
||||
llrp.h
|
||||
manager.cpp
|
||||
target.cpp
|
||||
target.h
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
LCP_ietf_uuid
|
||||
LCP_esta_acn_rlp
|
||||
LCP_esta_rdm
|
||||
LCP_esta_rdmnet_rpt
|
||||
)
|
||||
|
||||
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})
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
|
||||
#include "llrp.h"
|
||||
#include "rpt/rpt.h"
|
||||
#include "rpt.h"
|
||||
|
||||
namespace RDMnet::LLRP {
|
||||
|
|
@ -23,10 +23,10 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "rdmnet/pdu.h"
|
||||
#include "rdmnet/rdmnet.h"
|
||||
#include "rdm/uid.h"
|
||||
#include "uuid/uuid.h"
|
||||
#include "../pdu.h"
|
||||
#include "../rdmnet.h"
|
||||
#include "uid.h"
|
||||
#include "uuid.h"
|
||||
|
||||
namespace RDMnet::LLRP {
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
|
||||
#include "manager.h"
|
||||
#include "rdmnet/rdmnet.h"
|
||||
#include "../rdmnet.h"
|
||||
|
||||
namespace RDMnet::LLRP {
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "llrp.h"
|
||||
#include "rpt/rpt.h"
|
||||
#include "rpt.h"
|
||||
|
||||
namespace RDMnet::LLRP {
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "acn/pdu.h"
|
||||
#include "rdm/uid.h"
|
||||
#include "../acn/pdu.h"
|
||||
#include "uid.h"
|
||||
|
||||
namespace RDMnet {
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "rdm/rdm.h"
|
||||
#include "rdm.h"
|
||||
|
||||
/**
|
||||
* @brief @cite RDMnet The RDMnet Protocol
|
|
@ -0,0 +1,28 @@
|
|||
project(${PROJECT_NAME}_rpt VERSION 0.3.1 LANGUAGES CXX)
|
||||
configure_file(../../../config.h.in config.h)
|
||||
|
||||
add_library(${PROJECT_NAME} SHARED)
|
||||
|
||||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
broker.h
|
||||
controller.h
|
||||
PRIVATE
|
||||
broker.cpp
|
||||
controller.cpp
|
||||
device.cpp
|
||||
device.h
|
||||
rpt.cpp
|
||||
rpt.h
|
||||
)
|
||||
target_link_libraries(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
LCP_ietf_uuid
|
||||
LCP_esta_rdm
|
||||
)
|
||||
|
||||
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})
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "rdmnet/rdmnet.h"
|
||||
#include "../rdmnet.h"
|
||||
#include "rpt.h"
|
||||
|
||||
namespace RDMnet::RPT {
|
|
@ -23,9 +23,9 @@
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include "rdmnet/pdu.h"
|
||||
#include "rdm/message.h"
|
||||
#include "rdm/uid.h"
|
||||
#include "../pdu.h"
|
||||
#include "message.h"
|
||||
#include "uid.h"
|
||||
|
||||
namespace RDMnet::RPT {
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
llrp/manager.h
|
||||
PRIVATE
|
||||
llrp/llrp.cpp
|
||||
llrp/llrp.h
|
||||
llrp/manager.cpp
|
||||
llrp/target.cpp
|
||||
llrp/target.h
|
||||
)
|
|
@ -1,23 +0,0 @@
|
|||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
rdm/controller.h
|
||||
rdm/device.h
|
||||
rdm/message.h
|
||||
rdm/parameter.h
|
||||
rdm/responder.h
|
||||
rdm/sensor.h
|
||||
rdm/status.h
|
||||
PRIVATE
|
||||
rdm/controller.cpp
|
||||
rdm/device.cpp
|
||||
rdm/E1.37-1.h
|
||||
rdm/E1.37-2.h
|
||||
rdm/E1.37-7.h
|
||||
rdm/message.cpp
|
||||
rdm/parameter.cpp
|
||||
rdm/rdm.cpp
|
||||
rdm/rdm.h
|
||||
rdm/responder.cpp
|
||||
rdm/sensor.cpp
|
||||
rdm/uid.h
|
||||
)
|
|
@ -1,21 +0,0 @@
|
|||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
rdmnet/broker.h
|
||||
rdmnet/controller.h
|
||||
rdmnet/device.h
|
||||
PRIVATE
|
||||
rdmnet/broker-protocol.cpp
|
||||
rdmnet/broker-protocol.h
|
||||
rdmnet/broker.cpp
|
||||
rdmnet/controller.cpp
|
||||
rdmnet/device.cpp
|
||||
rdmnet/implementation.cpp
|
||||
rdmnet/implementation.h
|
||||
rdmnet/pdu.cpp
|
||||
rdmnet/pdu.h
|
||||
rdmnet/rdmnet.h
|
||||
)
|
||||
|
||||
include(ept/CMakeLists.txt)
|
||||
include(llrp/CMakeLists.txt)
|
||||
include(rpt/CMakeLists.txt)
|
|
@ -1,12 +0,0 @@
|
|||
target_sources(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
rpt/broker.h
|
||||
rpt/controller.h
|
||||
PRIVATE
|
||||
rpt/broker.cpp
|
||||
rpt/controller.cpp
|
||||
rpt/device.cpp
|
||||
rpt/device.h
|
||||
rpt/rpt.cpp
|
||||
rpt/rpt.h
|
||||
)
|
Loading…
Reference in New Issue