1
0
Fork 0

move sACN to a subproject

This commit is contained in:
Kevin Matz 2022-11-28 15:06:48 -05:00
parent 9e7b45d38c
commit a86d968569
25 changed files with 49 additions and 30 deletions

View File

@ -1,6 +1,6 @@
#pragma once
#include "sacn/extended.h"
#include "extended.h"
#include <QVariant>
#include <QVector>

View File

@ -21,7 +21,7 @@ target_sources(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PUBLIC
Qt::Network
LCP
LCP_esta_sacn
)
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)

View File

@ -2,7 +2,7 @@
#include "qsacn_global.h"
#include "qsacnuniverse.h"
#include "sacn/node.h"
#include "node.h"
#include <QHash>
#include <QHostAddress>

View File

@ -5,7 +5,7 @@
#include <QMap>
#include "qsacn_global.h"
#include "sacn/universe.h"
#include "universe.h"
/**
* @brief The QSacnUniverse class

View File

@ -21,8 +21,6 @@ add_library(${PROJECT_NAME} SHARED)
include(acn/CMakeLists.txt)
# E1.20
include(rdm/CMakeLists.txt)
# E1.31
include(sacn/CMakeLists.txt)
# E1.33
include(rdmnet/CMakeLists.txt)
# E1.56

View File

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

View File

@ -0,0 +1,38 @@
project(${PROJECT_NAME}_sacn VERSION 0.3.1 LANGUAGES CXX)
add_library(${PROJECT_NAME} SHARED)
target_sources(${PROJECT_NAME}
PUBLIC
node.h
receiver.h
source.h
universe.h
PRIVATE
data.cpp
data.h
extended.cpp
extended.h
arbitratinguniverse.cpp
arbitratinguniverse.h
node.cpp
receiver.cpp
sacn.h
source.cpp
universe.cpp
)
target_link_libraries(${PROJECT_NAME}
PUBLIC
LCP
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})

View File

@ -24,7 +24,7 @@
#include "dmp/dmp.h"
#include "data.h"
#include "sacn/sacn.h"
#include "sacn.h"
namespace sACN {
namespace DATA {

View File

@ -23,7 +23,7 @@
*/
#include "extended.h"
#include "sacn/sacn.h"
#include "sacn.h"
namespace sACN {
namespace EXTENDED {

View File

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

View File

@ -1,19 +0,0 @@
target_sources(${PROJECT_NAME}
PUBLIC
sacn/node.h
sacn/receiver.h
sacn/source.h
sacn/universe.h
PRIVATE
sacn/data.cpp
sacn/data.h
sacn/extended.cpp
sacn/extended.h
sacn/arbitratinguniverse.cpp
sacn/arbitratinguniverse.h
sacn/node.cpp
sacn/receiver.cpp
sacn/sacn.h
sacn/source.cpp
sacn/universe.cpp
)

View File

@ -13,8 +13,8 @@ if (GTest_FOUND)
target_link_libraries(${PROJECT_NAME}
PRIVATE
GTest::gtest
LCP
LCP_ietf_uuid
LCP_esta_sacn
)
target_include_directories(${PROJECT_NAME}
PUBLIC

View File

@ -24,7 +24,7 @@
#include <gtest/gtest.h>
#include "sacn/node.h"
#include "node.h"
class sACNdataTest
: public ::testing::Test