From 61d2857d60cbf10ec2f5b59e1c9dda6feee66a60 Mon Sep 17 00:00:00 2001 From: wyc <1104749580@qq.com> Date: Mon, 6 Jul 2026 15:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E8=A7=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/data_progress_config.json | 9 +++++++++ main.cmake | 24 ++++-------------------- toolchain/vs2019.json | 1 - toolchain/vs2022.json | 1 - 4 files changed, 13 insertions(+), 22 deletions(-) create mode 100644 config/data_progress_config.json diff --git a/config/data_progress_config.json b/config/data_progress_config.json new file mode 100644 index 0000000..e84b68b --- /dev/null +++ b/config/data_progress_config.json @@ -0,0 +1,9 @@ +{ + "library_path": "@/dll_source.dll", + "center_freq": 200000, + "band_width": 6000, + "sample_rate": 60000, + "fft_point_number": 2048, + "fft_period_ms": 50, + "fft_win_type": "blkmc" +} \ No newline at end of file diff --git a/main.cmake b/main.cmake index f04c4f4..0cd9b86 100644 --- a/main.cmake +++ b/main.cmake @@ -4,23 +4,9 @@ set(rely libarchive SQLiteCpp) rcl_load_dependency_environment(drogon ${rely}) -message(STATUS "before find SQLiteCpp CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}") - - -message(STATUS "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}") -message(STATUS "CMAKE_FIND_USE_CMAKE_PATH=${CMAKE_FIND_USE_CMAKE_PATH}") -message(STATUS "CMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}") -message(STATUS "CMAKE_FIND_ROOT_PATH_MODE_PACKAGE=${CMAKE_FIND_ROOT_PATH_MODE_PACKAGE}") - - -message("JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIRS} JSONCPP_LIBRARIES ${JSONCPP_LIBRARIES}") -find_package(Jsoncpp CONFIG) -list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") -if (MSVC AND NOT TARGET std::filesystem) - add_library(std::filesystem INTERFACE IMPORTED GLOBAL) - set_property(TARGET std::filesystem APPEND PROPERTY INTERFACE_COMPILE_FEATURES cxx_std_17) -endif () find_package(Drogon) +find_package(SQLiteCpp CONFIG REQUIRED) + set(Core Core_Static) @@ -47,7 +33,8 @@ if (1) _depend(dll_source ${Core}) _depend(data_process ${Core}) _attach_post_build_file(dll_source ${cfg_dir}/data_progress_config.json - "${CMAKE_CURRENT_LIST_DIR}/data/BIN_Blank_Text/ADS-B_195_0205.txt") + # "${CMAKE_CURRENT_LIST_DIR}/data/BIN_Blank_Text/ADS-B_195_0205.txt" + ) _create("dll" mlat_source) @@ -61,9 +48,6 @@ if (1) _depend(mlat_source_exe ${Core}) - find_package(SQLiteCpp CONFIG REQUIRED) - - _create("exe" ecap_server) _depend(ecap_server SSR) _attach_include_dir(ecap_server "${md}") diff --git a/toolchain/vs2019.json b/toolchain/vs2019.json index 4693bba..7ef429c 100644 --- a/toolchain/vs2019.json +++ b/toolchain/vs2019.json @@ -9,7 +9,6 @@ { "name": "vs2019", "hidden": true, - "graphviz": "${sourceDir}/../build/${presetName}/graphviz/yc.dot", "generator": "Ninja", "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/toolchain/vs2019.cmake" diff --git a/toolchain/vs2022.json b/toolchain/vs2022.json index bf55b51..168b92f 100644 --- a/toolchain/vs2022.json +++ b/toolchain/vs2022.json @@ -9,7 +9,6 @@ { "name": "vs2022", "hidden": true, - "graphviz": "${sourceDir}/../build/${presetName}/graphviz/yc.dot", "generator": "Ninja", "cacheVariables": { "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/toolchain/vs2022.cmake"