Merge pull request #76 from wadehunk/pdu-utils-reorg

Utilities reorganization based on DIS version

CMakeLists.txt

@@ -6,6 +6,11 @@ option(BUILD_SHARED_LIBS "build shared libraries" ON)
 option(BUILD_EXAMPLES "build example sender/receiver applications" OFF)
 option(BUILD_TESTS "build unit tests" OFF)
 
+# Enforce a C++11 compliant compiler
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 # include GNUInstallDirs Module to get more generic directory handling
 include(GNUInstallDirs)
 
@@ -21,20 +26,15 @@ target_include_directories(OpenDIS6
 # Define OpenDIS7 Library
 add_library(OpenDIS7 "")
 
-# Add src/ to the include directories to OpenDIS6
+# Add src/ to the include directories to DIS7
 target_include_directories(OpenDIS7
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
          $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
          $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
-# Add compile definition EXPORT_LIBRARY for shared libs
-if(NOT BUILD_SHARED_LIBS)
-  target_compile_definitions(OpenDIS6 PRIVATE OpenDIS6_STATIC_DEFINE)
-  target_compile_definitions(OpenDIS7 PRIVATE OpenDIS7_STATIC_DEFINE)
-endif()
-
 # Add source directories
 add_subdirectory(src)
+add_subdirectory(cmake)
 
 # Build example applications
 if(BUILD_EXAMPLES)
@@ -48,10 +48,10 @@ if(BUILD_TESTS)
 endif()
 
 # Configure install target (i.e. what files to install)
-install(TARGETS OpenDIS6 EXPORT OpenDIS6Config DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-install(EXPORT OpenDIS6Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/OpenDIS6")
-install(TARGETS OpenDIS7 EXPORT OpenDIS7Config DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-install(EXPORT OpenDIS7Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/OpenDIS7")
+install(TARGETS OpenDIS6 OpenDIS7 EXPORT OpenDISTargets DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+install(EXPORT OpenDISTargets
+        NAMESPACE OpenDIS::
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/OpenDIS")
 
 # configure package target (i.e. Package Types, and meta data)
 set(CPACK_GENERATOR "DEB" "RPM" "TXZ" "TGZ")

cmake/CMakeLists.txt

@@ -0,0 +1,18 @@
+set(OPENDIS_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/OpenDIS")
+
+include(CMakePackageConfigHelpers)
+
+configure_package_config_file(
+  OpenDISConfig.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/OpenDISConfig.cmake
+  INSTALL_DESTINATION ${OPENDIS_PACKAGE_DIR}
+)
+
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/OpenDISConfigVersion.cmake"
+  VERSION "${PROJECT_VERSION_FULL}"
+  COMPATIBILITY SameMajorVersion)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenDISConfig.cmake
+              ${CMAKE_CURRENT_BINARY_DIR}/OpenDISConfigVersion.cmake
+        DESTINATION ${OPENDIS_PACKAGE_DIR})

cmake/OpenDISConfig.cmake.in

@@ -0,0 +1,12 @@
+@PACKAGE_INIT@
+
+include(${CMAKE_CURRENT_LIST_DIR}/OpenDISTargets.cmake)
+
+## Add target aliases
+add_library(OpenDIS::DIS6 ALIAS OpenDIS::OpenDIS6)
+add_library(OpenDIS::DIS7 ALIAS OpenDIS::OpenDIS7)
+
+## These are deprecated target names. All new references to the targets
+## should utilize the new namespace wrapped version
+add_library(OpenDIS6 ALIAS OpenDIS::OpenDIS6)
+add_library(OpenDIS7 ALIAS OpenDIS::OpenDIS7)

examples/CMakeLists.txt

@@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 # Require the OpenDIS6 target
 if(NOT TARGET OpenDIS6)
-  find_package(OpenDIS6 REQUIRED)
+  find_package(OpenDIS REQUIRED)
 endif()
 
 # SDL2 is required to build the examples

examples/EntityStatePduProcessor.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/EntityStatePdu.h>                  // for typedef
-#include <utils/IPacketProcessor.h>                // for base class
+#include <dis6/utils/IPacketProcessor.h>                // for base class
 
 namespace Example
 {

examples/main.cpp

@@ -7,11 +7,11 @@
 // the DIS library usage
 #include <dis6/EntityStatePdu.h>
 #include <dis6/DetonationPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/Vector3Double.h>
 #include <dis6/BurstDescriptor.h>
 
-#include <utils/Conversion.h>
+#include <dis6/utils/Conversion.h>
 
 #include <iostream>
 

examples/main_receive.cpp

@@ -3,7 +3,7 @@
 #include "EntityStatePduProcessor.h"     // for usage
 #include "Utils.h"
 
-#include <utils/IncomingMessage.h>                 // for library usage
+#include <dis6/utils/IncomingMessage.h>                 // for library usage
 #include <dis6/EntityStatePdu.h>                  // for library usage
 
 #include <cstring>                       // for strlen

src/CMakeLists.txt

@@ -1,4 +1,3 @@
 # Add all subdirectories
 add_subdirectory(dis6)
 add_subdirectory(dis7)
-add_subdirectory(utils)

src/dis6/AcknowledgePdu.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/SimulationManagementFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AcknowledgeReliablePdu.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/SimulationManagementWithReliabilityFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AcousticBeamData.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/AcousticBeamFundamentalParameter.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AcousticBeamFundamentalParameter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AcousticEmitter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AcousticEmitterSystem.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AcousticEmitterSystemData.h

@@ -4,7 +4,7 @@
 #include <dis6/Vector3Float.h>
 #include <dis6/AcousticBeamData.h>
 #include <vector>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/ActionRequestPdu.h

@@ -4,7 +4,7 @@
 #include <dis6/VariableDatum.h>
 #include <vector>
 #include <dis6/SimulationManagementFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/ActionRequestReliablePdu.h

@@ -4,7 +4,7 @@
 #include <dis6/VariableDatum.h>
 #include <vector>
 #include <dis6/SimulationManagementWithReliabilityFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/ActionResponsePdu.h

@@ -4,7 +4,7 @@
 #include <dis6/VariableDatum.h>
 #include <vector>
 #include <dis6/SimulationManagementFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/ActionResponseReliablePdu.h

@@ -4,7 +4,7 @@
 #include <dis6/VariableDatum.h>
 #include <vector>
 #include <dis6/SimulationManagementWithReliabilityFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AggregateID.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AggregateMarking.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AggregateStatePdu.h

@@ -14,7 +14,7 @@
 #include <dis6/VariableDatum.h>
 #include <vector>
 #include <dis6/EntityManagementFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AggregateType.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AngularVelocityVector.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/AntennaLocation.h

@@ -2,7 +2,7 @@
 
 #include <dis6/Vector3Double.h>
 #include <dis6/Vector3Float.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/ApaData.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/ArealObjectStatePdu.h

@@ -9,7 +9,7 @@
 #include <dis6/Vector3Double.h>
 #include <vector>
 #include <dis6/SyntheticEnvironmentFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/ArticulationParameter.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/BeamAntennaPattern.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/Orientation.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/BeamData.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/BurstDescriptor.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/EntityType.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/CMakeLists.txt

@@ -1,3 +1,5 @@
+add_subdirectory(utils)
+
 # Create list of all headers
 set(dis6_hdr
   AcknowledgePdu.h

src/dis6/ClockTime.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/CollisionElasticPdu.h

@@ -7,7 +7,7 @@
 #include <dis6/Vector3Float.h>
 #include <dis6/Vector3Float.h>
 #include <dis6/EntityInformationFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/CollisionPdu.h

@@ -6,7 +6,7 @@
 #include <dis6/Vector3Float.h>
 #include <dis6/Vector3Float.h>
 #include <dis6/EntityInformationFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/CommentPdu.h

@@ -4,7 +4,7 @@
 #include <dis6/VariableDatum.h>
 #include <vector>
 #include <dis6/SimulationManagementFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/CommentReliablePdu.h

@@ -4,7 +4,7 @@
 #include <dis6/VariableDatum.h>
 #include <vector>
 #include <dis6/SimulationManagementWithReliabilityFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/CreateEntityPdu.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/SimulationManagementFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>
 
 

src/dis6/CreateEntityReliablePdu.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <dis6/SimulationManagementWithReliabilityFamilyPdu.h>
-#include <utils/DataStream.h>
+#include <dis6/utils/DataStream.h>
 #include <dis6/opendis6_export.h>