new config subfolder

eclipse-ecal · Nov 23, 2023 · 709a2c2 · 709a2c2
1 parent 922df8a
commit 709a2c2
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt
@@ -1,4 +1,4 @@
-# ========================= eCAL LICENSE =================================
+  # ========================= eCAL LICENSE =================================
 #
 # Copyright (C) 2016 - 2019 Continental Corporation
 #
@@ -57,6 +57,16 @@ if(UNIX)
   endif()
 endif()
 
+######################################
+# config
+######################################
+set(ecal_config_src
+    src/config/ecal_config.cpp
+    src/config/ecal_config_reader.cpp
+    src/config/ecal_config_reader.h
+    src/config/ecal_config_reader_hlp.h
+)
+
 ######################################
 # io/mtx
 ######################################
@@ -290,8 +300,6 @@ set(ecal_util_src
 set(ecal_cmn_src
     src/ecal.cpp
     src/ecal_clang.cpp
-    src/ecal_config.cpp
-    src/ecal_config_reader.cpp
     src/ecal_descgate.cpp
     src/ecal_event.cpp 
     src/ecal_global_accessors.cpp
@@ -302,8 +310,6 @@ set(ecal_cmn_src
     src/ecal_timer.cpp
     src/ecal_util.cpp
     src/ecalc.cpp
-    src/ecal_config_reader.h
-    src/ecal_config_reader_hlp.h
     src/ecal_def.h
     src/ecal_def_ini.h
     src/ecal_descgate.h
@@ -345,7 +351,6 @@ set(ecal_header_cmn
     include/ecal/ecal.h
     include/ecal/ecal_callback.h
     include/ecal/ecal_clang.h
-    include/ecal/ecal_config.h
     include/ecal/ecal_client.h
     include/ecal/ecal_config.h
     include/ecal/ecal_core.h
@@ -430,7 +435,7 @@ set(ecal_header_public
 )
 
 ecal_add_ecal_shared_library(${PROJECT_NAME} 
-    ${ecal_custom_tclap_src}
+    ${ecal_config_src}
     ${ecal_io_mtx_src}
     ${ecal_io_mtx_linux_src}
     ${ecal_io_mtx_win_src}
@@ -548,8 +553,7 @@ install(DIRECTORY
 
 if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0") 
   source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES 
-    ${ecal_custom_tclap_src}
-    ${ecal_io_cpp_src}
+    ${ecal_config_src}
     ${ecal_io_mtx_src}
     ${ecal_io_mtx_linux_src}
     ${ecal_io_mtx_win_src}

diff --git a/ecal/core/src/ecal_config.cpp → ecal/core/src/config/ecal_config.cpp b/ecal/core/src/ecal_config.cpp → ecal/core/src/config/ecal_config.cpp
diff --git a/ecal/core/src/ecal_config_reader.cpp → ecal/core/src/config/ecal_config_reader.cpp b/ecal/core/src/ecal_config_reader.cpp → ecal/core/src/config/ecal_config_reader.cpp
diff --git a/ecal/core/src/ecal_config_reader.h → ecal/core/src/config/ecal_config_reader.h b/ecal/core/src/ecal_config_reader.h → ecal/core/src/config/ecal_config_reader.h
diff --git a/ecal/core/src/ecal_config_reader_hlp.h → .../core/src/config/ecal_config_reader_hlp.h b/ecal/core/src/ecal_config_reader_hlp.h → .../core/src/config/ecal_config_reader_hlp.h
diff --git a/ecal/core/src/ecal_globals.cpp b/ecal/core/src/ecal_globals.cpp
@@ -23,7 +23,7 @@
 
 #include "ecal_globals.h"
 #include "io/udp/udp_init.h"
-#include "ecal_config_reader.h"
+#include "config/ecal_config_reader.h"
 
 #include <stdexcept>
 

diff --git a/ecal/core/src/ecal_process.cpp b/ecal/core/src/ecal_process.cpp
@@ -25,7 +25,7 @@
 #include <ecal/ecal_config.h>
 
 #include "ecal_def.h"
-#include "ecal_config_reader_hlp.h"
+#include "config/ecal_config_reader_hlp.h"
 #include "registration/ecal_registration_receiver.h"
 #include "ecal_globals.h"
 #include "ecal_process.h"

diff --git a/ecal/core/src/ecal_timegate.cpp b/ecal/core/src/ecal_timegate.cpp
@@ -26,7 +26,7 @@
 
 #include <ecal/ecal_config.h>
 
-#include "ecal_config_reader_hlp.h"
+#include "config/ecal_config_reader_hlp.h"
 #include "ecal_def.h"
 #include "ecal_process.h"
 #include "ecal_timegate.h"

diff --git a/ecal/core/src/monitoring/ecal_monitoring_impl.cpp b/ecal/core/src/monitoring/ecal_monitoring_impl.cpp
@@ -24,7 +24,7 @@
 #include <ecal/ecal.h>
 #include <ecal/ecal_config.h>
 
-#include "ecal_config_reader_hlp.h"
+#include "config/ecal_config_reader_hlp.h"
 #include "ecal_monitoring_impl.h"
 
 #include <regex>

diff --git a/ecal/core/src/pubsub/ecal_publisher.cpp b/ecal/core/src/pubsub/ecal_publisher.cpp
@@ -25,7 +25,7 @@
 #include <ecal/ecal_tlayer.h>
 #include <ecal/ecal_config.h>
 
-#include "ecal_config_reader_hlp.h"
+#include "config/ecal_config_reader_hlp.h"
 #include "readwrite/ecal_buffer_payload_writer.h"
 #include "ecal_globals.h"
 

diff --git a/ecal/core/src/readwrite/ecal_writer.cpp b/ecal/core/src/readwrite/ecal_writer.cpp
@@ -27,7 +27,7 @@
 
 #include "ecal_def.h"
 #include "ecal_buffer_payload_writer.h"
-#include "ecal_config_reader_hlp.h"
+#include "config/ecal_config_reader_hlp.h"
 
 #include "registration/ecal_registration_provider.h"
 #include "registration/ecal_registration_receiver.h"