From 66e5f37c74eee993b7f431a376753bd16bd7da8e Mon Sep 17 00:00:00 2001 From: "Timur A. Fatkhullin" Date: Sun, 15 Feb 2026 20:43:51 +0300 Subject: [PATCH] move headers to include/mcc to match duild and deploy configurations move mcc_bsplines.h from fitpack to include/mcc rewrite CMakeLists.txt to incorporate these changes --- CMakeLists.txt | 62 +++++++++++-------- fitpack/CMakeLists.txt | 3 +- mcc_angle.h => include/mcc/mcc_angle.h | 0 {fitpack => include/mcc}/mcc_bsplines.h | 0 .../mcc/mcc_ccte_erfa.h | 0 .../mcc/mcc_ccte_iers.h | 0 .../mcc/mcc_ccte_iers_default.h | 0 mcc_concepts.h => include/mcc/mcc_concepts.h | 0 .../mcc/mcc_constants.h | 0 .../mcc/mcc_coordinate.h | 0 .../mcc/mcc_deserializer.h | 0 .../mcc/mcc_deserializer.h.old | 0 mcc_epoch.h => include/mcc/mcc_epoch.h | 0 mcc_error.h => include/mcc/mcc_error.h | 0 .../mcc/mcc_generic_mount.h | 0 .../mcc/mcc_netserver.h | 0 .../mcc/mcc_netserver_endpoint.h | 0 .../mcc/mcc_netserver_proto.h | 0 mcc_pcm.h => include/mcc/mcc_pcm.h | 2 +- mcc_pzone.h => include/mcc/mcc_pzone.h | 0 .../mcc/mcc_pzone_container.h | 0 .../mcc/mcc_serialization_common.h | 0 .../mcc/mcc_serializer.h | 0 .../mcc/mcc_serializer.h.old | 0 mcc_spdlog.h => include/mcc/mcc_spdlog.h | 0 .../mcc/mcc_telemetry.h | 0 mcc_traits.h => include/mcc/mcc_traits.h | 0 mcc_utils.h => include/mcc/mcc_utils.h | 0 tests/mcc_coord_test.cpp | 7 +-- tests/mcc_fitpack_test.cpp | 2 +- tests/mcc_netmsg_test.cpp | 2 +- tests/mcc_pzone_test.cpp | 6 +- tests/mcc_telemetry_test.cpp | 6 +- 33 files changed, 50 insertions(+), 40 deletions(-) rename mcc_angle.h => include/mcc/mcc_angle.h (100%) rename {fitpack => include/mcc}/mcc_bsplines.h (100%) rename mcc_ccte_erfa.h => include/mcc/mcc_ccte_erfa.h (100%) rename mcc_ccte_iers.h => include/mcc/mcc_ccte_iers.h (100%) rename mcc_ccte_iers_default.h => include/mcc/mcc_ccte_iers_default.h (100%) rename mcc_concepts.h => include/mcc/mcc_concepts.h (100%) rename mcc_constants.h => include/mcc/mcc_constants.h (100%) rename mcc_coordinate.h => include/mcc/mcc_coordinate.h (100%) rename mcc_deserializer.h => include/mcc/mcc_deserializer.h (100%) rename mcc_deserializer.h.old => include/mcc/mcc_deserializer.h.old (100%) rename mcc_epoch.h => include/mcc/mcc_epoch.h (100%) rename mcc_error.h => include/mcc/mcc_error.h (100%) rename mcc_generic_mount.h => include/mcc/mcc_generic_mount.h (100%) rename mcc_netserver.h => include/mcc/mcc_netserver.h (100%) rename mcc_netserver_endpoint.h => include/mcc/mcc_netserver_endpoint.h (100%) rename mcc_netserver_proto.h => include/mcc/mcc_netserver_proto.h (100%) rename mcc_pcm.h => include/mcc/mcc_pcm.h (99%) rename mcc_pzone.h => include/mcc/mcc_pzone.h (100%) rename mcc_pzone_container.h => include/mcc/mcc_pzone_container.h (100%) rename mcc_serialization_common.h => include/mcc/mcc_serialization_common.h (100%) rename mcc_serializer.h => include/mcc/mcc_serializer.h (100%) rename mcc_serializer.h.old => include/mcc/mcc_serializer.h.old (100%) rename mcc_spdlog.h => include/mcc/mcc_spdlog.h (100%) rename mcc_telemetry.h => include/mcc/mcc_telemetry.h (100%) rename mcc_traits.h => include/mcc/mcc_traits.h (100%) rename mcc_utils.h => include/mcc/mcc_utils.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2457273..aafdb56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,53 +196,63 @@ if(USE_ASIO) endif() endif() -if(USE_BSPLINE_PCM) - # fitpack by P. Dierckx - add_subdirectory(fitpack) -endif() +# if(USE_BSPLINE_PCM) +# # fitpack by P. Dierckx +# add_subdirectory(fitpack) +# endif() set(MCC_SRC - mcc_concepts.h - mcc_constants.h - mcc_epoch.h - mcc_angle.h - mcc_coordinate.h - mcc_error.h - mcc_traits.h - mcc_utils.h - mcc_pzone.h - mcc_pzone_container.h - mcc_pcm.h - mcc_telemetry.h - mcc_serialization_common.h - mcc_deserializer.h - mcc_serializer.h - mcc_generic_mount.h + include/mcc/mcc_concepts.h + include/mcc/mcc_constants.h + include/mcc/mcc_epoch.h + include/mcc/mcc_angle.h + include/mcc/mcc_coordinate.h + include/mcc/mcc_error.h + include/mcc/mcc_traits.h + include/mcc/mcc_utils.h + include/mcc/mcc_pzone.h + include/mcc/mcc_pzone_container.h + include/mcc/mcc_pcm.h + include/mcc/mcc_telemetry.h + include/mcc/mcc_serialization_common.h + include/mcc/mcc_deserializer.h + include/mcc/mcc_serializer.h + include/mcc/mcc_generic_mount.h ) if(USE_SPDLOG) - list(APPEND MCC_SRC mcc_spdlog.h) + list(APPEND MCC_SRC include/mcc/mcc_spdlog.h) endif() if(USE_ERFA) - list(APPEND MCC_SRC mcc_ccte_iers.h mcc_ccte_iers_default.h mcc_ccte_erfa.h) + list(APPEND MCC_SRC include/mcc/mcc_ccte_iers.h include/mcc/mcc_ccte_iers_default.h include/mcc/mcc_ccte_erfa.h) endif() if(USE_ASIO) list( APPEND MCC_SRC - mcc_netserver_endpoint.h - mcc_netserver_proto.h - mcc_netserver.h + include/mcc/mcc_netserver_endpoint.h + include/mcc/mcc_netserver_proto.h + include/mcc/mcc_netserver.h ) endif() +if(USE_BSPLINE_PCM) + # fitpack by P. Dierckx + list( + APPEND MCC_SRC + include/mcc/mcc_bsplines.h + ) + add_subdirectory(fitpack) +endif() + + add_library(${PROJECT_NAME} INTERFACE ${MCC_SRC}) target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_23) target_include_directories( ${PROJECT_NAME} INTERFACE - "$" + "$" "$" ) diff --git a/fitpack/CMakeLists.txt b/fitpack/CMakeLists.txt index 4a8f870..125c7f6 100644 --- a/fitpack/CMakeLists.txt +++ b/fitpack/CMakeLists.txt @@ -31,7 +31,8 @@ FortranCInterface_VERIFY(CXX) # set(FITPACK_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) # include_directories(${BSPLINES_INCLUDE_DIR}) -add_library(fitpack_project STATIC EXCLUDE_FROM_ALL ${src_files} mcc_bsplines.h) +# add_library(fitpack_project STATIC EXCLUDE_FROM_ALL ${src_files} mcc_bsplines.h) +add_library(fitpack_project STATIC EXCLUDE_FROM_ALL ${src_files}) add_library(fitpack STATIC IMPORTED GLOBAL) set_target_properties( diff --git a/mcc_angle.h b/include/mcc/mcc_angle.h similarity index 100% rename from mcc_angle.h rename to include/mcc/mcc_angle.h diff --git a/fitpack/mcc_bsplines.h b/include/mcc/mcc_bsplines.h similarity index 100% rename from fitpack/mcc_bsplines.h rename to include/mcc/mcc_bsplines.h diff --git a/mcc_ccte_erfa.h b/include/mcc/mcc_ccte_erfa.h similarity index 100% rename from mcc_ccte_erfa.h rename to include/mcc/mcc_ccte_erfa.h diff --git a/mcc_ccte_iers.h b/include/mcc/mcc_ccte_iers.h similarity index 100% rename from mcc_ccte_iers.h rename to include/mcc/mcc_ccte_iers.h diff --git a/mcc_ccte_iers_default.h b/include/mcc/mcc_ccte_iers_default.h similarity index 100% rename from mcc_ccte_iers_default.h rename to include/mcc/mcc_ccte_iers_default.h diff --git a/mcc_concepts.h b/include/mcc/mcc_concepts.h similarity index 100% rename from mcc_concepts.h rename to include/mcc/mcc_concepts.h diff --git a/mcc_constants.h b/include/mcc/mcc_constants.h similarity index 100% rename from mcc_constants.h rename to include/mcc/mcc_constants.h diff --git a/mcc_coordinate.h b/include/mcc/mcc_coordinate.h similarity index 100% rename from mcc_coordinate.h rename to include/mcc/mcc_coordinate.h diff --git a/mcc_deserializer.h b/include/mcc/mcc_deserializer.h similarity index 100% rename from mcc_deserializer.h rename to include/mcc/mcc_deserializer.h diff --git a/mcc_deserializer.h.old b/include/mcc/mcc_deserializer.h.old similarity index 100% rename from mcc_deserializer.h.old rename to include/mcc/mcc_deserializer.h.old diff --git a/mcc_epoch.h b/include/mcc/mcc_epoch.h similarity index 100% rename from mcc_epoch.h rename to include/mcc/mcc_epoch.h diff --git a/mcc_error.h b/include/mcc/mcc_error.h similarity index 100% rename from mcc_error.h rename to include/mcc/mcc_error.h diff --git a/mcc_generic_mount.h b/include/mcc/mcc_generic_mount.h similarity index 100% rename from mcc_generic_mount.h rename to include/mcc/mcc_generic_mount.h diff --git a/mcc_netserver.h b/include/mcc/mcc_netserver.h similarity index 100% rename from mcc_netserver.h rename to include/mcc/mcc_netserver.h diff --git a/mcc_netserver_endpoint.h b/include/mcc/mcc_netserver_endpoint.h similarity index 100% rename from mcc_netserver_endpoint.h rename to include/mcc/mcc_netserver_endpoint.h diff --git a/mcc_netserver_proto.h b/include/mcc/mcc_netserver_proto.h similarity index 100% rename from mcc_netserver_proto.h rename to include/mcc/mcc_netserver_proto.h diff --git a/mcc_pcm.h b/include/mcc/mcc_pcm.h similarity index 99% rename from mcc_pcm.h rename to include/mcc/mcc_pcm.h index 4159ee2..f6d0afe 100644 --- a/mcc_pcm.h +++ b/include/mcc/mcc_pcm.h @@ -10,7 +10,7 @@ #include #ifdef USE_BSPLINE_PCM -#include "fitpack/mcc_bsplines.h" +#include "mcc_bsplines.h" #endif #include "mcc_concepts.h" diff --git a/mcc_pzone.h b/include/mcc/mcc_pzone.h similarity index 100% rename from mcc_pzone.h rename to include/mcc/mcc_pzone.h diff --git a/mcc_pzone_container.h b/include/mcc/mcc_pzone_container.h similarity index 100% rename from mcc_pzone_container.h rename to include/mcc/mcc_pzone_container.h diff --git a/mcc_serialization_common.h b/include/mcc/mcc_serialization_common.h similarity index 100% rename from mcc_serialization_common.h rename to include/mcc/mcc_serialization_common.h diff --git a/mcc_serializer.h b/include/mcc/mcc_serializer.h similarity index 100% rename from mcc_serializer.h rename to include/mcc/mcc_serializer.h diff --git a/mcc_serializer.h.old b/include/mcc/mcc_serializer.h.old similarity index 100% rename from mcc_serializer.h.old rename to include/mcc/mcc_serializer.h.old diff --git a/mcc_spdlog.h b/include/mcc/mcc_spdlog.h similarity index 100% rename from mcc_spdlog.h rename to include/mcc/mcc_spdlog.h diff --git a/mcc_telemetry.h b/include/mcc/mcc_telemetry.h similarity index 100% rename from mcc_telemetry.h rename to include/mcc/mcc_telemetry.h diff --git a/mcc_traits.h b/include/mcc/mcc_traits.h similarity index 100% rename from mcc_traits.h rename to include/mcc/mcc_traits.h diff --git a/mcc_utils.h b/include/mcc/mcc_utils.h similarity index 100% rename from mcc_utils.h rename to include/mcc/mcc_utils.h diff --git a/tests/mcc_coord_test.cpp b/tests/mcc_coord_test.cpp index 969d689..3461fad 100644 --- a/tests/mcc_coord_test.cpp +++ b/tests/mcc_coord_test.cpp @@ -1,9 +1,8 @@ #include -// #include -// #include -#include "mcc_deserializer.h" -#include "mcc_serializer.h" +#include +#include + using namespace mcc::impl; diff --git a/tests/mcc_fitpack_test.cpp b/tests/mcc_fitpack_test.cpp index a0de8ff..2f73d12 100644 --- a/tests/mcc_fitpack_test.cpp +++ b/tests/mcc_fitpack_test.cpp @@ -4,7 +4,7 @@ #include #include -#include "fitpack/mcc_bsplines.h" +#include int main() { diff --git a/tests/mcc_netmsg_test.cpp b/tests/mcc_netmsg_test.cpp index faf8fb3..2c83b16 100644 --- a/tests/mcc_netmsg_test.cpp +++ b/tests/mcc_netmsg_test.cpp @@ -1,7 +1,7 @@ #include #include -#include "mcc_netserver_proto.h" +#include int main() { diff --git a/tests/mcc_pzone_test.cpp b/tests/mcc_pzone_test.cpp index d36c9e2..da61c69 100644 --- a/tests/mcc_pzone_test.cpp +++ b/tests/mcc_pzone_test.cpp @@ -1,8 +1,8 @@ #include -#include "mcc_coordinate.h" -#include "mcc_pzone.h" -#include "mcc_pzone_container.h" +#include +#include +#include using namespace mcc::impl; diff --git a/tests/mcc_telemetry_test.cpp b/tests/mcc_telemetry_test.cpp index 4fa16ee..8d720db 100644 --- a/tests/mcc_telemetry_test.cpp +++ b/tests/mcc_telemetry_test.cpp @@ -2,9 +2,9 @@ #include -#include "mcc_pcm.h" -#include "mcc_serializer.h" -#include "mcc_telemetry.h" +#include +#include +#include static std::random_device rd; static std::mt19937 gen(rd());