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

@@ -196,53 +196,63 @@ if(USE_ASIO)
     endif()
 endif()
 
-if(USE_BSPLINE_PCM)
+# if(USE_BSPLINE_PCM)
-    # fitpack by P. Dierckx
+#     # fitpack by P. Dierckx
-    add_subdirectory(fitpack)
+#     add_subdirectory(fitpack)
-endif()
+# endif()
 
 set(MCC_SRC
-    mcc_concepts.h
+    include/mcc/mcc_concepts.h
-    mcc_constants.h
+    include/mcc/mcc_constants.h
-    mcc_epoch.h
+    include/mcc/mcc_epoch.h
-    mcc_angle.h
+    include/mcc/mcc_angle.h
-    mcc_coordinate.h
+    include/mcc/mcc_coordinate.h
-    mcc_error.h
+    include/mcc/mcc_error.h
-    mcc_traits.h
+    include/mcc/mcc_traits.h
-    mcc_utils.h
+    include/mcc/mcc_utils.h
-    mcc_pzone.h
+    include/mcc/mcc_pzone.h
-    mcc_pzone_container.h
+    include/mcc/mcc_pzone_container.h
-    mcc_pcm.h
+    include/mcc/mcc_pcm.h
-    mcc_telemetry.h
+    include/mcc/mcc_telemetry.h
-    mcc_serialization_common.h
+    include/mcc/mcc_serialization_common.h
-    mcc_deserializer.h
+    include/mcc/mcc_deserializer.h
-    mcc_serializer.h
+    include/mcc/mcc_serializer.h
-    mcc_generic_mount.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
+        include/mcc/mcc_netserver_endpoint.h
-        mcc_netserver_proto.h
+        include/mcc/mcc_netserver_proto.h
-        mcc_netserver.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
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
         "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
 )
 

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(

include/mcc/mcc_pcm.h

@@ -10,7 +10,7 @@
 #include <mutex>
 
 #ifdef USE_BSPLINE_PCM
-#include "fitpack/mcc_bsplines.h"
+#include "mcc_bsplines.h"
 #endif
 
 #include "mcc_concepts.h"

tests/mcc_coord_test.cpp

@@ -1,9 +1,8 @@
 #include <iostream>
 
-// #include <mcc_ccte_erfa.h>
+#include <mcc/mcc_deserializer.h>
-// #include <mcc_coordinate.h>
+#include <mcc/mcc_serializer.h>
-#include "mcc_deserializer.h"
+
-#include "mcc_serializer.h"
 
 using namespace mcc::impl;
 

tests/mcc_fitpack_test.cpp

@@ -4,7 +4,7 @@
 #include <random>
 #include <ranges>
 
-#include "fitpack/mcc_bsplines.h"
+#include <mcc/mcc_bsplines.h>
 
 int main()
 {

tests/mcc_netmsg_test.cpp

@@ -1,7 +1,7 @@
 #include <list>
 #include <print>
 
-#include "mcc_netserver_proto.h"
+#include <mcc/mcc_netserver_proto.h>
 
 int main()
 {

tests/mcc_pzone_test.cpp

@@ -1,8 +1,8 @@
 #include <iostream>
 
-#include "mcc_coordinate.h"
+#include <mcc/mcc_coordinate.h>
-#include "mcc_pzone.h"
+#include <mcc/mcc_pzone.h>
-#include "mcc_pzone_container.h"
+#include <mcc/mcc_pzone_container.h>
 
 using namespace mcc::impl;
 

tests/mcc_telemetry_test.cpp

@@ -2,9 +2,9 @@
 
 #include <random>
 
-#include "mcc_pcm.h"
+#include <mcc/mcc_pcm.h>
-#include "mcc_serializer.h"
+#include <mcc/mcc_serializer.h>
-#include "mcc_telemetry.h"
+#include <mcc/mcc_telemetry.h>
 
 static std::random_device rd;
 static std::mt19937 gen(rd());