1
0
Fork 0

move DMX to submodule

This commit is contained in:
Kevin Matz 2022-11-28 14:55:05 -05:00
parent 375ec153fe
commit 13d1251511
18 changed files with 36 additions and 19 deletions

View File

@ -103,7 +103,7 @@ SHOW_NAMESPACES = YES
FILE_VERSION_FILTER =
LAYOUT_FILE =
CITE_BIB_FILES = @CMAKE_CURRENT_SOURCE_DIR@/protocol/artistic/ARTISTIC.bib \
@CMAKE_CURRENT_SOURCE_DIR@/ESTA.bib \
@CMAKE_CURRENT_SOURCE_DIR@/protocol/esta/ESTA.bib \
@CMAKE_CURRENT_SOURCE_DIR@/protocol/ietf/IETF.bib
#---------------------------------------------------------------------------
# Configuration options related to warning and progress messages

View File

@ -17,8 +17,6 @@ add_compile_definitions(BUILT_WITH_CMAKE)
configure_file(config.h.in config.h)
add_library(${PROJECT_NAME} SHARED)
# E1.11
include(dmx/CMakeLists.txt)
# E1.17
include(acn/CMakeLists.txt)
# E1.20
@ -30,6 +28,10 @@ include(rdmnet/CMakeLists.txt)
# E1.56
include(otp/CMakeLists.txt)
# Entertainment Services and Technology Association
add_subdirectory(esta)
# Internet Engineering Task Force
add_subdirectory(ietf)
@ -39,6 +41,7 @@ add_subdirectory(artistic)
target_link_libraries(${PROJECT_NAME}
PUBLIC
LCP_ietf_uuid
LCP_esta_dmx
)
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})

View File

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

View File

@ -1,13 +0,0 @@
target_sources(${PROJECT_NAME}
PUBLIC
dmx/device.h
dmx/patch.h
dmx/personality.h
dmx/universe.h
PRIVATE
dmx/device.cpp
dmx/dmx.h
dmx/patch.cpp
dmx/personality.cpp
dmx/universe.cpp
)

View File

@ -0,0 +1,4 @@
project(${PROJECT_NAME}_esta)
# E1.11
add_subdirectory(dmx)

View File

@ -0,0 +1,23 @@
project(${PROJECT_NAME}_dmx VERSION 0.3.1 LANGUAGES CXX)
add_library(${PROJECT_NAME} SHARED)
target_sources(${PROJECT_NAME}
PUBLIC
device.h
patch.h
personality.h
universe.h
PRIVATE
device.cpp
dmx.h
patch.cpp
personality.cpp
universe.cpp
)
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})

View File

@ -23,7 +23,7 @@
*/
#pragma once
#include "dmx/device.h"
#include "esta/dmx/device.h"
#include "parameter.h"
#include "rdm.h"
#include "sensor.h"

View File

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