Move thirdparty under include/liboculus

CMakeLists.txt

@@ -40,9 +40,7 @@ if(${ros_environment_FOUND})
             oculus
             PUBLIC
                 "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-                "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/thirdparty>"
-                "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
-                "$<INSTALL_INTERFACE:include/thirdparty>"
+                "$<INSTALL_INTERFACE:include/>"
         )
 
         install(
@@ -54,7 +52,7 @@ if(${ros_environment_FOUND})
         )
 
         install(
-            DIRECTORY include/ thirdparty
+            DIRECTORY include/
             DESTINATION include
             FILES_MATCHING
             PATTERN "*.hpp"
@@ -73,13 +71,13 @@ if(${ros_environment_FOUND})
 
         catkin_package(
             CATKIN_DEPENDS g3log_ros
-            INCLUDE_DIRS include thirdparty
+            INCLUDE_DIRS include
             LIBRARIES liboculus
         )
 
         add_library(liboculus ${oculus_SRCS})
 
-        include_directories(liboculus include thirdparty ${catkin_INCLUDE_DIRS})
+        include_directories(liboculus include ${catkin_INCLUDE_DIRS})
 
         target_link_libraries(liboculus ${catkin_LIBRARIES})
 
@@ -92,7 +90,7 @@ if(${ros_environment_FOUND})
 
         ## Install headers
         install(
-            DIRECTORY include/${PROJECT_NAME}/ thirdparty/
+            DIRECTORY include/${PROJECT_NAME}/
             DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
             FILES_MATCHING
             PATTERN "*.hpp"

README.md

@@ -101,7 +101,7 @@ The client must implement callbacks that will handle data from the sonar ([for e
 This library makes liberal use of overlay classes in order to provide
 zero-copy accessor functions into the raw data chunks received from
 the oculus.  These classes overlay the struct hierarchy defined in
-thirdparty/Oculus/Oculus.h, making it possible to directly cast between the types depending on which accessors you want to use:
+`include/liboculus/thirdparty/Oculus/Oculus.h`, making it possible to directly cast between the types depending on which accessors you want to use:
 * OculusSimplePingResult carries all image data from the oculus.
 * Its first field is the OculusSimpleFireMessage that triggered data collection
 * In turn, the first field of the OculusSimpleFireMessage is an OculusMessageHeader
@@ -142,4 +142,4 @@ Other files/classes:
 
 This code is released under the [BSD 3-clause license](LICENSE).
 
-This repository contains one file provided by Blueprint as part of their free "Oculus Viewer" sample application: ([thirdparty/Oculus/Oculus.h](thirdpart/Oculus/Oculus.h)).  It describes their protocol and data formats.   This file is distributed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).
+This repository contains one file provided by Blueprint as part of their free "Oculus Viewer" sample application: ([include/liboculus/thirdparty/Oculus/Oculus.h](thirdpart/Oculus/Oculus.h)).  It describes their protocol and data formats.   This file is distributed under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html).

include/liboculus/BearingData.h

@@ -32,8 +32,8 @@
 
 #include <g3log/g3log.hpp> // needed for CHECK macro
 
-#include "Oculus/Oculus.h"
 #include "liboculus/DataTypes.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/Constants.h

@@ -37,7 +37,7 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/DataTypes.h

@@ -37,7 +37,7 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/GainData.h

@@ -36,8 +36,8 @@
 #include <iostream>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/DataTypes.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/ImageData.h

@@ -37,7 +37,7 @@
 #include <iostream>
 
 #include "DataTypes.h"
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/MessageHeader.h

@@ -39,7 +39,7 @@
 #include "BearingData.h"
 #include "DataTypes.h"
 #include "ImageData.h"
-#include "Oculus/Oculus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/SimpleFireMessage.h

@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/Constants.h"
 #include "liboculus/MessageHeader.h"
 #include "liboculus/SonarConfiguration.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/SimplePingResult.h

@@ -37,13 +37,13 @@
 #include <string>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/BearingData.h"
 #include "liboculus/DataTypes.h"
 #include "liboculus/GainData.h"
 #include "liboculus/ImageData.h"
 #include "liboculus/SimpleFireMessage.h"
 #include "liboculus/SonarConfiguration.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/SonarConfiguration.h

@@ -33,8 +33,8 @@
 #include <boost/asio.hpp>
 #include <vector>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/Constants.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/SonarStatus.h

@@ -36,9 +36,9 @@
 #include <mutex>
 #include <thread>
 
-#include "Oculus/Oculus.h"
 #include "g3log/g3log.hpp"
 #include "liboculus/DataTypes.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

include/liboculus/StatusRx.h

@@ -35,9 +35,9 @@
 #include <memory>
 #include <mutex>
 
-#include "Oculus/Oculus.h"
 #include "liboculus/IoServiceThread.h"
 #include "liboculus/SonarStatus.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {
 

lib/SonarPlayer.cpp

@@ -33,12 +33,12 @@
 #include <fstream>
 #include <iostream>
 
-#include "Oculus/Oculus.h"
 #include "g3log/g3log.hpp"
 #include "liboculus/Constants.h"
 #include "liboculus/DataTypes.h"
 #include "liboculus/MessageHeader.h"
 #include "liboculus/SimplePingResult.h"
+#include "liboculus/thirdparty/Oculus/Oculus.h"
 
 namespace liboculus {