This commit is contained in:
2026-02-13 16:24:15 +03:00
parent accbeff765
commit 6ffc8e3582
7 changed files with 32 additions and 22 deletions

View File

@@ -242,8 +242,8 @@ target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_23)
target_include_directories(
${PROJECT_NAME}
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR};>
$<INSTALL_INTERFACE:include/${PROJECT_NAME}>
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
)
if(USE_ERFA)

View File

@@ -5,8 +5,8 @@ set(func_name "")
file(GLOB src_files "*.f")
foreach(ff IN LISTS src_files)
get_filename_component(sn ${ff} NAME_WE)
list(APPEND func_name ${sn})
get_filename_component(sn ${ff} NAME_WE)
list(APPEND func_name ${sn})
endforeach()
# message(STATUS "${func_name}")
@@ -18,12 +18,13 @@ string(REPLACE ";" " " func_str "${func_name}")
enable_language(Fortran CXX)
include(FortranCInterface)
FortranCInterface_HEADER(FortranCInterface.h
MACRO_NAMESPACE "FC_"
# SYMBOL_NAMESPACE "fp_"
SYMBOL_NAMESPACE ""
# SYMBOLS ${func_str}
SYMBOLS ${func_name}
FortranCInterface_HEADER(
FortranCInterface.h
MACRO_NAMESPACE "FC_"
# SYMBOL_NAMESPACE "fp_"
SYMBOL_NAMESPACE ""
# SYMBOLS ${func_str}
SYMBOLS ${func_name}
)
FortranCInterface_VERIFY(CXX)
@@ -33,6 +34,15 @@ FortranCInterface_VERIFY(CXX)
add_library(fitpack_project STATIC EXCLUDE_FROM_ALL ${src_files} mcc_bsplines.h)
add_library(fitpack STATIC IMPORTED GLOBAL)
set_target_properties(fitpack PROPERTIES IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/fitpack/libfitpack_project.a)
set_target_properties(fitpack PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}")
set_target_properties(
fitpack
PROPERTIES
IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/fitpack/libfitpack_project.a
)
set_target_properties(
fitpack
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}"
)
add_dependencies(fitpack fitpack_project)

View File

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

View File

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

View File

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

View File

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

View File

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