Moving headers into include/sls (#212)

slsSupportLib/CMakeLists.txt

@@ -14,14 +14,14 @@ set(SOURCES
 
 # Header files to install as a part of the library
 set(PUBLICHEADERS
-    include/sls_detector_defs.h
-    include/sls_detector_exceptions.h
-    include/container_utils.h
-    include/string_utils.h
-    include/network_utils.h
-    include/ToString.h
-    include/TypeTraits.h
-    include/TimeHelper.h
+    include/sls/sls_detector_defs.h
+    include/sls/sls_detector_exceptions.h
+    include/sls/container_utils.h
+    include/sls/string_utils.h
+    include/sls/network_utils.h
+    include/sls/ToString.h
+    include/sls/TypeTraits.h
+    include/sls/TimeHelper.h
 )
 
 # Additional headers to be installed if SLS_DEVEL_HEADERS
@@ -31,18 +31,18 @@ set(PUBLICHEADERS
 if(SLS_DEVEL_HEADERS)
     set(PUBLICHEADERS
         ${PUBLICHEADERS}
-        include/file_utils.h
-        include/sls_detector_funcs.h
-        include/ClientSocket.h
-        include/DataSocket.h
-        include/ServerSocket.h
-        include/ServerInterface.h
-        include/Timer.h
-        include/StaticVector.h
-        include/UdpRxSocket.h
-        include/versionAPI.h
-        include/ZmqSocket.h
-        include/bit_utils.h
+        include/sls/file_utils.h
+        include/sls/sls_detector_funcs.h
+        include/sls/ClientSocket.h
+        include/sls/DataSocket.h
+        include/sls/ServerSocket.h
+        include/sls/ServerInterface.h
+        include/sls/Timer.h
+        include/sls/StaticVector.h
+        include/sls/UdpRxSocket.h
+        include/sls/versionAPI.h
+        include/sls/ZmqSocket.h
+        include/sls/bit_utils.h
     )
 endif()
 
@@ -106,6 +106,6 @@ install(TARGETS slsSupportShared slsSupportStatic slsSupportObject
     EXPORT "${TARGETS_EXPORT_NAME}"
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sls
 )
 

slsSupportLib/include/sls/ClientSocket.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "DataSocket.h"
+#include "sls/DataSocket.h"
 #include <netdb.h>
 #include <string>
 #include <sys/socket.h>

slsSupportLib/include/sls/DataSocket.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "TypeTraits.h"
+#include "sls/TypeTraits.h"
 #include <cstddef>
 #include <cstdint>
 #include <iostream>

slsSupportLib/include/sls/ServerInterface.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "DataSocket.h"
+#include "sls/DataSocket.h"
 namespace sls {
 class ServerInterface;
 }
 
-#include "ServerSocket.h"
-#include "sls_detector_defs.h"
+#include "sls/ServerSocket.h"
+#include "sls/sls_detector_defs.h"
 namespace sls {
 
 class ServerInterface : public DataSocket {

slsSupportLib/include/sls/ServerSocket.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "DataSocket.h"
-#include "ServerInterface.h"
-#include "network_utils.h"
+#include "sls/DataSocket.h"
+#include "sls/ServerInterface.h"
+#include "sls/network_utils.h"
 #include <cstdint>
 #include <netdb.h>
 #include <string>

slsSupportLib/include/sls/StaticVector.h

@@ -1,6 +1,6 @@
 #pragma once
-#include "ToString.h"
-#include "TypeTraits.h"
+#include "sls/ToString.h"
+#include "sls/TypeTraits.h"
 #include <array>
 #include <cassert>
 #include <iostream>

slsSupportLib/include/sls/TimeHelper.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <chrono>
 
-#include "TypeTraits.h"
+#include "sls/TypeTraits.h"
 namespace sls {
 namespace time {
 using ns = std::chrono::nanoseconds;

slsSupportLib/include/sls/ToString.h

@@ -7,11 +7,11 @@
  *
  */
 
-#include "TimeHelper.h"
-#include "TypeTraits.h"
-#include "sls_detector_defs.h"
-#include "sls_detector_exceptions.h"
-#include "string_utils.h"
+#include "sls/TimeHelper.h"
+#include "sls/TypeTraits.h"
+#include "sls/sls_detector_defs.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/string_utils.h"
 #include <array>
 #include <chrono>
 #include <iomanip>

slsSupportLib/include/sls/ZmqSocket.h

@@ -7,7 +7,7 @@
  *@short functions to open/close zmq sockets
  */
 
-#include "sls_detector_exceptions.h"
+#include "sls/sls_detector_exceptions.h"
 #include <rapidjson/document.h> //json header in zmq stream
 
 #define MAX_STR_LENGTH 1000
@@ -16,7 +16,7 @@
 #define ROIVERBOSITY
 
 class zmq_msg_t;
-#include "container_utils.h"
+#include "sls/container_utils.h"
 #include <map>
 #include <memory>
 /** zmq header structure */

slsSupportLib/include/sls/container_utils.h

@@ -9,7 +9,7 @@
 #include <type_traits>
 #include <vector>
 
-#include "TypeTraits.h"
+#include "sls/TypeTraits.h"
 
 namespace sls {
 

slsSupportLib/include/sls/file_utils.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 
 #include <cstdio>
 #include <fstream>

slsSupportLib/include/sls/logger.h

@@ -1,7 +1,7 @@
 #pragma once
 /*Utility to log to console*/
 
-#include "ansi.h" //Colors
+#include "sls/ansi.h" //Colors
 #include <iostream>
 #include <sstream>
 #include <sys/time.h>

slsSupportLib/include/sls/sls_detector_defs.h

@@ -16,7 +16,7 @@
 
 #ifdef __cplusplus
 // C++ includes
-#include "sls_detector_exceptions.h"
+#include "sls/sls_detector_exceptions.h"
 #include <algorithm>
 #include <bitset>
 #include <chrono>
@@ -491,7 +491,7 @@ typedef struct {
 #endif
 
     // #ifndef MYROOT
-    // #include "sls_detector_funcs.h"
+    // #include "sls/sls_detector_funcs.h"
     // #endif
 
 #ifdef __cplusplus

slsSupportLib/src/ClientSocket.cpp

@@ -1,7 +1,7 @@
-#include "ClientSocket.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
-#include "sls_detector_exceptions.h"
+#include "sls/ClientSocket.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
+#include "sls/sls_detector_exceptions.h"
 #include <arpa/inet.h>
 #include <cassert>
 #include <cstring>

slsSupportLib/src/DataSocket.cpp

@@ -1,6 +1,6 @@
-#include "DataSocket.h"
-#include "logger.h"
-#include "sls_detector_exceptions.h"
+#include "sls/DataSocket.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_exceptions.h"
 #include <algorithm>
 #include <arpa/inet.h>
 #include <cassert>

slsSupportLib/src/ServerInterface.cpp

@@ -1,5 +1,5 @@
-#include "ServerInterface.h"
-#include "logger.h"
+#include "sls/ServerInterface.h"
+#include "sls/logger.h"
 #include <cassert>
 #include <cstring>
 #include <sstream>

slsSupportLib/src/ServerSocket.cpp

@@ -1,11 +1,11 @@
-#include "ServerSocket.h"
-#include "ServerInterface.h"
+#include "sls/ServerSocket.h"
+#include "sls/ServerInterface.h"
 
-#include "DataSocket.h"
-#include "logger.h"
-#include "sls_detector_defs.h"
-#include "sls_detector_exceptions.h"
-#include "string_utils.h"
+#include "sls/DataSocket.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_defs.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/string_utils.h"
 
 #include <arpa/inet.h>
 #include <cstring>

slsSupportLib/src/ToString.cpp

@@ -1,5 +1,5 @@
-#include "ToString.h"
-#include "network_utils.h"
+#include "sls/ToString.h"
+#include "sls/network_utils.h"
 
 namespace sls {
 

slsSupportLib/src/UdpRxSocket.cpp

@@ -1,7 +1,7 @@
-#include "UdpRxSocket.h"
-#include "logger.h"
-#include "network_utils.h"
-#include "sls_detector_exceptions.h"
+#include "sls/UdpRxSocket.h"
+#include "sls/logger.h"
+#include "sls/network_utils.h"
+#include "sls/sls_detector_exceptions.h"
 #include <cstdint>
 #include <errno.h>
 #include <iostream>

slsSupportLib/src/ZmqSocket.cpp

@@ -1,6 +1,6 @@
-#include "ZmqSocket.h"
-#include "logger.h"
-#include "network_utils.h" //ip
+#include "sls/ZmqSocket.h"
+#include "sls/logger.h"
+#include "sls/network_utils.h" //ip
 #include <chrono>
 #include <errno.h>
 #include <iostream>

slsSupportLib/src/file_utils.cpp

@@ -1,6 +1,6 @@
-#include "file_utils.h"
-#include "logger.h"
-#include "sls_detector_exceptions.h"
+#include "sls/file_utils.h"
+#include "sls/logger.h"
+#include "sls/sls_detector_exceptions.h"
 
 #include <errno.h>
 #include <iostream>

slsSupportLib/src/network_utils.cpp

@@ -1,6 +1,6 @@
-#include "sls_detector_exceptions.h"
+#include "sls/sls_detector_exceptions.h"
 
-#include "network_utils.h"
+#include "sls/network_utils.h"
 #include <algorithm>
 #include <arpa/inet.h>
 #include <cassert>

slsSupportLib/src/sls_detector_exceptions.cpp

@@ -1,5 +1,5 @@
-#include "sls_detector_exceptions.h"
-#include "logger.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/logger.h"
 namespace sls {
 RuntimeError::RuntimeError() : runtime_error("SLS Detector Package Failed") {
     LOG(logERROR) << "SLS Detector Package Failed";

slsSupportLib/src/string_utils.cpp

@@ -1,7 +1,7 @@
 
-#include "string_utils.h"
-#include "container_utils.h"
-#include "network_utils.h"
+#include "sls/string_utils.h"
+#include "sls/container_utils.h"
+#include "sls/network_utils.h"
 #include <algorithm>
 #include <iomanip>
 #include <sstream>

slsSupportLib/tests/test-Sockets.cpp

@@ -1,5 +1,5 @@
-#include "ClientSocket.h"
-#include "ServerSocket.h"
+#include "sls/ClientSocket.h"
+#include "sls/ServerSocket.h"
 #include "catch.hpp"
 #include <chrono>
 #include <future>

slsSupportLib/tests/test-StaticVector.cpp

@@ -1,5 +1,5 @@
-#include "StaticVector.h"
-#include "TypeTraits.h"
+#include "sls/StaticVector.h"
+#include "sls/TypeTraits.h"
 #include "catch.hpp"
 
 #include <array>

slsSupportLib/tests/test-Timer.cpp

@@ -1,4 +1,4 @@
-#include "Timer.h"
+#include "sls/Timer.h"
 #include "catch.hpp"
 
 #include <chrono>

slsSupportLib/tests/test-ToString.cpp

@@ -1,8 +1,8 @@
-#include "TimeHelper.h"
-#include "ToString.h"
+#include "sls/TimeHelper.h"
+#include "sls/ToString.h"
 #include "catch.hpp"
-#include "network_utils.h"
-#include "sls_detector_defs.h"
+#include "sls/network_utils.h"
+#include "sls/sls_detector_defs.h"
 #include <array>
 #include <map>
 #include <sstream>

slsSupportLib/tests/test-TypeTraits.cpp

@@ -1,4 +1,4 @@
-#include "TypeTraits.h"
+#include "sls/TypeTraits.h"
 #include "catch.hpp"
 #include <array>
 #include <chrono>

slsSupportLib/tests/test-UdpRxSocket.cpp

@@ -1,6 +1,6 @@
-#include "UdpRxSocket.h"
+#include "sls/UdpRxSocket.h"
 #include "catch.hpp"
-#include "sls_detector_exceptions.h"
+#include "sls/sls_detector_exceptions.h"
 #include <cstdint>
 #include <errno.h>
 #include <future>

slsSupportLib/tests/test-ZmqSocket.cpp

@@ -1,4 +1,4 @@
-#include "ZmqSocket.h"
+#include "sls/ZmqSocket.h"
 #include "catch.hpp"
 
 TEST_CASE("Throws when cannot create socket") {

slsSupportLib/tests/test-bit_utils.cpp

@@ -1,4 +1,4 @@
-#include "bit_utils.h"
+#include "sls/bit_utils.h"
 #include "catch.hpp"
 #include <vector>
 

slsSupportLib/tests/test-container_utils.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "container_utils.h"
+#include "sls/container_utils.h"
 #include <exception>
 #include <string>
 #include <vector>

slsSupportLib/tests/test-logger.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "logger.h"
+#include "sls/logger.h"
 #include <chrono>
 #include <fstream>
 #include <iostream>

slsSupportLib/tests/test-network_utils.cpp

@@ -1,12 +1,12 @@
 
 #include "catch.hpp"
-#include "network_utils.h"
+#include "sls/network_utils.h"
 #include <iostream>
 #include <sstream>
 #include <vector>
 
-#include "sls_detector_exceptions.h"
-#include "string_utils.h"
+#include "sls/sls_detector_exceptions.h"
+#include "sls/string_utils.h"
 
 using namespace sls;
 

slsSupportLib/tests/test-sls_detector_defs.cpp

@@ -1,5 +1,5 @@
 #include "catch.hpp"
-#include "sls_detector_defs.h"
+#include "sls/sls_detector_defs.h"
 
 using dt = slsDetectorDefs::detectorType;
 

slsSupportLib/tests/test-string_utils.cpp

@@ -1,9 +1,9 @@
 #include "catch.hpp"
-#include "logger.h"
+#include "sls/logger.h"
 #include <iostream>
 #include <vector>
 
-#include "string_utils.h"
+#include "sls/string_utils.h"
 
 TEST_CASE("copy a string") {