Boost support buildable again

Iandiehard · Jan 21, 2024 · 10e8013 · 10e8013
1 parent c13d5f6
commit 10e8013
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 30 deletions.
diff --git a/diag-client-lib/lib/boost-support/CMakeLists.txt b/diag-client-lib/lib/boost-support/CMakeLists.txt
@@ -14,13 +14,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 find_package(Boost 1.78.0)
 find_package(OpenSSL)
 
-file(GLOB LIBBOOST_COMMON_SRCS "src/boost-support/common/*.cpp")
-file(GLOB LIBBOOST_CLIENT_TCP_SRCS "include/boost-support/client/tcp/*.cpp")
-file(GLOB LIBBOOST_SOCKET_SRCS "src/boost-support/socket/*.cpp")
-file(GLOB LIBBOOST_SOCKET_TCP_SRCS "src/boost-support/socket/tcp/*.cpp")
-file(GLOB LIBBOOST_SOCKET_TLS_SRCS "src/boost-support/socket/tls/*.cpp")
-file(GLOB LIBBOOST_SOCKET_UDP_SRCS "src/boost-support/socket/udp/*.cpp")
-file(GLOB LIBBOOST_JSON_PARSER_SRCS "include/boost-support/parser/*.cpp")
+file(GLOB_RECURSE HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
+file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
 set(LIBBOOST_SOCKET_SRCS
         ${LIBBOOST_SOCKET_SRCS}
@@ -30,15 +25,14 @@ set(LIBBOOST_SOCKET_SRCS
 )
 
 add_library(${PROJECT_NAME}
-        ${LIBBOOST_COMMON_SRCS}
-        ${LIBBOOST_CLIENT_TCP_SRCS}
-        ${LIBBOOST_SOCKET_SRCS}
-        ${LIBBOOST_JSON_PARSER_SRCS}
+        ${HEADERS}
+        ${SOURCES}
 )
 
 #Link include directory
 target_include_directories(${PROJECT_NAME} PUBLIC
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
         "$<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>"
 )
 

diff --git a/diag-client-lib/lib/boost-support/include/boost-support/server/tcp/tcp_server.h b/diag-client-lib/lib/boost-support/include/boost-support/server/tcp/tcp_server.h
@@ -13,7 +13,7 @@
 #include <string_view>
 #include <vector>
 
-#include "src/boost-support/socket/tcp/tcp_message.h"
+#include "boost-support/socket/tcp/tcp_message.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/include/boost-support/socket/tcp/tcp_socket.h b/diag-client-lib/lib/boost-support/include/boost-support/socket/tcp/tcp_socket.h
@@ -10,8 +10,8 @@
 
 #include <boost/asio.hpp>
 
+#include "boost-support/socket/tcp/tcp_message.h"
 #include "core/include/result.h"
-#include "src/boost-support/socket/tcp/tcp_message.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/include/boost-support/socket/tls/tls_socket.h b/diag-client-lib/lib/boost-support/include/boost-support/socket/tls/tls_socket.h
@@ -10,9 +10,9 @@
 
 #include <boost/asio.hpp>
 
+#include "boost-support/socket/tcp/tcp_message.h"
+#include "boost-support/socket/tls/tls_context.h"
 #include "core/include/result.h"
-#include "src/boost-support/socket/tcp/tcp_message.h"
-#include "tls_context.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/parser/json_parser.cpp b/diag-client-lib/lib/boost-support/src/boost-support/parser/json_parser.cpp
@@ -6,9 +6,9 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#include "include/boost-support/parser/json_parser.h"
+#include "boost-support/parser/json_parser.h"
 
-#include "src/boost-support/common/logger.h"
+#include "boost-support/common/logger.h"
 
 namespace boost_support {
 namespace parser {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/server/tcp/tcp_server.cpp b/diag-client-lib/lib/boost-support/src/boost-support/server/tcp/tcp_server.cpp
@@ -5,8 +5,9 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-#include "server/tcp/tcp_server.h"
-#include "common/logger.h"
+#include "boost-support/server/tcp/tcp_server.h"
+
+#include "boost-support/common/logger.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/socket/io_context.cpp b/diag-client-lib/lib/boost-support/src/boost-support/socket/io_context.cpp
@@ -6,7 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "io_context.h"
+#include "boost-support/socket/io_context.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/socket/tcp/tcp_socket.cpp b/diag-client-lib/lib/boost-support/src/boost-support/socket/tcp/tcp_socket.cpp
@@ -6,11 +6,11 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#include "include/boost-support/socket/tcp/tcp_socket.h"
+#include "boost-support/socket/tcp/tcp_socket.h"
 
 #include <utility>
 
-#include "common/logger.h"
+#include "boost-support/common/logger.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/socket/tcp/tls_client.cpp b/diag-client-lib/lib/boost-support/src/boost-support/socket/tcp/tls_client.cpp
@@ -6,11 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "tls_client.h"
+#include "boost-support/socket/tcp/tls_client.h"
 
 #include <utility>
 
-#include "common/logger.h"
+#include "boost-support/common/logger.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/socket/tcp/tls_server.cpp b/diag-client-lib/lib/boost-support/src/boost-support/socket/tcp/tls_server.cpp
@@ -5,11 +5,11 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-#include "tls_server.h"
+#include "boost-support/socket/tcp/tls_server.h"
 
 #include <utility>
 
-#include "common/logger.h"
+#include "boost-support/common/logger.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/socket/tls/tls_socket.cpp b/diag-client-lib/lib/boost-support/src/boost-support/socket/tls/tls_socket.cpp
@@ -6,11 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "include/boost-support/socket/tls/tls_socket.h"
+#include "boost-support/socket/tls/tls_socket.h"
 
 #include <utility>
 
-#include "common/logger.h"
+#include "boost-support/common/logger.h"
 
 namespace boost_support {
 namespace socket {

diff --git a/diag-client-lib/lib/boost-support/src/boost-support/socket/udp/udp_client.cpp b/diag-client-lib/lib/boost-support/src/boost-support/socket/udp/udp_client.cpp
@@ -6,9 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "include/boost-support/socket/udp/udp_client.h"
+#include "boost-support/socket/udp/udp_client.h"
 
-#include "common/logger.h"
+#include "boost-support/common/logger.h"
 
 namespace boost_support {
 namespace socket {