cmake cleanups

CMakeLists.txt

@@ -1,108 +1,111 @@
 cmake_minimum_required(VERSION 3.14)
 
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
 # set the project name and version
-project(ESTA VERSION 0.1.1)
+project(ESTA VERSION 0.1.1 LANGUAGES CXX)
 set(DEFAULT_BUILD_TYPE "Release")
 configure_file(config.h.in config.h)
+
 add_compile_definitions(BUILT_WITH_CMAKE)
 
-# specify the C++ standard
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
 endif()
+
 set(CMAKE_AUTOUIC OFF)
 set(CMAKE_AUTOMOC OFF)
 set(CMAKE_AUTORCC OFF)
 
 set(SOURCE_FILES
-  acn/acn.h
+    acn/acn.h
-  acn/appliance.cpp
+    acn/appliance.cpp
-  acn/appliance.h
+    acn/appliance.h
-  acn/component.h
+    acn/component.h
-  acn/dmp.cpp
+    acn/dmp.cpp
-  acn/dmp.h
+    acn/dmp.h
-  acn/pdu-stream.cpp
+    acn/pdu-stream.cpp
-  acn/pdu-stream.h
+    acn/pdu-stream.h
-  acn/pdu.cpp
+    acn/pdu.cpp
-  acn/pdu.h
+    acn/pdu.h
-  acn/rlp-tcp.cpp
+    acn/rlp-tcp.cpp
-  acn/rlp-tcp.h
+    acn/rlp-tcp.h
-  acn/rlp-udp.cpp
+    acn/rlp-udp.cpp
-  acn/rlp-udp.h
+    acn/rlp-udp.h
-  acn/rlp.cpp
+    acn/rlp.cpp
-  acn/rlp.h
+    acn/rlp.h
-  acn/sdt-udp.cpp
+    acn/sdt-udp.cpp
-  acn/sdt-udp.h
+    acn/sdt-udp.h
-  acn/sdt.cpp
+    acn/sdt.cpp
-  acn/sdt.h
+    acn/sdt.h
-  dmx/device.h
+    dmx/device.h
-  dmx/device.cpp
+    dmx/device.cpp
-  dmx/dmx.h
+    dmx/dmx.h
-  dmx/personality.h
+    dmx/personality.h
-  dmx/personality.cpp
+    dmx/personality.cpp
-  dmx/universe.cpp
+    dmx/universe.cpp
-  dmx/universe.h
+    dmx/universe.h
-  otp/opt.h
+    otp/opt.h
-  rdm/controller.h
+    rdm/controller.h
-  rdm/controller.cpp
+    rdm/controller.cpp
-  rdm/device.h
+    rdm/device.h
-  rdm/device.cpp
+    rdm/device.cpp
-  rdm/E1.37-1.h
+    rdm/E1.37-1.h
-  rdm/E1.37-2.h
+    rdm/E1.37-2.h
-  rdm/E1.37-7.h
+    rdm/E1.37-7.h
-  rdm/message.h
+    rdm/message.h
-  rdm/message.cpp
+    rdm/message.cpp
-  rdm/parameter.h
+    rdm/parameter.h
-  rdm/parameter.cpp
+    rdm/parameter.cpp
-  rdm/rdm.h
+    rdm/rdm.h
-  rdm/rdm.cpp
+    rdm/rdm.cpp
-  rdm/responder.h
+    rdm/responder.h
-  rdm/responder.cpp
+    rdm/responder.cpp
-  rdm/sensor.h
+    rdm/sensor.h
-  rdm/sensor.cpp
+    rdm/sensor.cpp
-  rdm/status.h
+    rdm/status.h
-  rdm/uid.h
+    rdm/uid.h
-  rdmnet/broker-protocol.h
+    rdmnet/broker-protocol.h
-  rdmnet/broker-protocol.cpp
+    rdmnet/broker-protocol.cpp
-  rdmnet/broker.h
+    rdmnet/broker.h
-  rdmnet/broker.cpp
+    rdmnet/broker.cpp
-  rdmnet/client.h
+    rdmnet/client.h
-  rdmnet/client.cpp
+    rdmnet/client.cpp
-  rdmnet/controller.h
+    rdmnet/controller.h
-  rdmnet/controller.cpp
+    rdmnet/controller.cpp
-  rdmnet/device.h
+    rdmnet/device.h
-  rdmnet/device.cpp
+    rdmnet/device.cpp
-  rdmnet/ept.cpp
+    rdmnet/ept.cpp
-  rdmnet/ept.h
+    rdmnet/ept.h
-  rdmnet/llrp.cpp
+    rdmnet/llrp.cpp
-  rdmnet/llrp.h
+    rdmnet/llrp.h
-  rdmnet/manager.h
+    rdmnet/manager.h
-  rdmnet/manager.cpp
+    rdmnet/manager.cpp
-  rdmnet/pdu.h
+    rdmnet/pdu.h
-  rdmnet/rdmnet.h
+    rdmnet/rdmnet.h
-  rdmnet/rpt.cpp
+    rdmnet/rpt.cpp
-  rdmnet/rpt.h
+    rdmnet/rpt.h
-  rdmnet/target.h
+    rdmnet/target.h
-  rdmnet/target.cpp
+    rdmnet/target.cpp
-  sacn/data.cpp
+    sacn/data.cpp
-  sacn/data.h
+    sacn/data.h
-  sacn/extended.cpp
+    sacn/extended.cpp
-  sacn/extended.h
+    sacn/extended.h
-  sacn/node.cpp
+    sacn/node.cpp
-  sacn/node.h
+    sacn/node.h
-  sacn/receiver.cpp
+    sacn/receiver.cpp
-  sacn/receiver.h
+    sacn/receiver.h
-  sacn/sacn.h
+    sacn/sacn.h
-  sacn/source.cpp
+    sacn/source.cpp
-  sacn/source.h
+    sacn/source.h
-  sacn/universe.cpp
+    sacn/universe.cpp
-  sacn/universe.h
+    sacn/universe.h
-  uuid/uuid.cpp
+    uuid/uuid.cpp
-  uuid/uuid.h
+    uuid/uuid.h
-)
+    )
 
 add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES})
 #add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
@@ -111,3 +114,4 @@ 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})

platform/qt/CMakeLists.txt

@@ -1,8 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(QsACNNode LANGUAGES CXX)
+project(QsACNNode VERSION 0.1 LANGUAGES CXX)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -17,14 +16,17 @@ find_package(QT NAMES Qt6 Qt5 COMPONENTS Network Gui REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network Gui REQUIRED)
 
 add_library(${PROJECT_NAME} STATIC
-  qsacnnode_global.h
+    qsacnnode_global.h
-  qsacnnode.cpp
+    qsacnnode.cpp
-  qsacnnode.h
+    qsacnnode.h
-  qsacnuniverse.h
+    qsacnuniverse.h
-  universemodel.h
+    universemodel.h
-  universemodel.cpp
+    universemodel.cpp
-)
+    )
 
-target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Gui ESTA)
+target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Gui)
+target_link_libraries(${PROJECT_NAME} PUBLIC ESTA)
+
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC QT_LIBRARY)

platform/qt/qsacnnode.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "qsacnnode_global.h"
-#include "../../sacn/node.h"
+#include "sacn/node.h"
 
 #include <QHash>
 #include <QHostAddress>

platform/qt/qsacnuniverse.h

@@ -3,7 +3,7 @@
 #include <QObject>
 
 #include "qsacnnode_global.h"
-#include "../../sacn/universe.h"
+#include "sacn/universe.h"
 
 /**
  * @brief The QSacnUniverse class