From 64e5d663caa5d96806b684a8e3322df2a87e0df9 Mon Sep 17 00:00:00 2001 From: RCi Date: Sun, 27 Jul 2025 16:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BaseModules/CMakeLists.txt | 3 ++- BaseModules/algoModules/CMakeLists.txt | 11 +++++++++++ .../Hd_FangDing_module/CMakeLists.txt | 0 .../Hd_FangDing_module/Hd_FangDing_module.cpp | 0 .../Hd_FangDing_module/Hd_FangDing_module.h | 0 .../{ => algoModules}/Hd_FangDing_module/base.h | 0 .../Hd_FangDing_module/generalJsonParsing.hpp | 0 .../Hd_FangDing_module/nlohmannJson.hpp | 0 .../Hd_LogicDll_module/CMakeLists.txt | 0 .../Hd_LogicDll_module/Hd_LogicDll_module.cpp | 0 .../Hd_LogicDll_module/Hd_LogicDll_module.h | 0 .../Hd_LogicDll_module/Logic_camera_thread.cpp | 0 .../Hd_LogicDll_module/Logic_camera_thread.h | 0 .../Hd_LogicDll_module/Logic_hdataintegration.cpp | 0 .../Hd_LogicDll_module/Logic_hdataintegration.h | 0 .../Hd_LogicDll_module/Logic_hdataprocess.cpp | 0 .../Hd_LogicDll_module/Logic_hdataprocess.h | 0 .../Hd_LogicDll_module/Logic_myiothread.cpp | 0 .../Hd_LogicDll_module/Logic_myiothread.h | 0 .../Hd_LogicDll_module/Logic_processtask.cpp | 0 .../Hd_LogicDll_module/Logic_processtask.h | 0 .../Hd_LogicDll_module/Logic_taskthread.cpp | 0 .../Hd_LogicDll_module/Logic_taskthread.h | 0 .../{ => algoModules}/Hd_LogicDll_module/base.h | 0 .../Hd_LogicDll_module/base_Logic.h | 0 .../Hd_LogicDll_module/nlohmannJson.hpp | 0 .../Hd_LogicDll_module/rlib/detData.h | 0 .../Hd_LogicDll_module/rlib/fileManager.h | 0 .../Hd_LogicDll_module/rlib/rlib_writeCsv.cpp | 0 .../Hd_LogicDll_module/rlib/rlib_writeCsv.h | 0 .../{ => algoModules}/Hd_LogicDll_module/struct.h | 0 .../{ => algoModules}/Hd_LogicDll_module/test.h | 0 .../Hd_LogicDll_module/toolkit.cpp | 0 .../{ => algoModules}/Hd_LogicDll_module/toolkit.h | 0 .../Hd_YuHang_module/CMakeLists.txt | 0 .../Hd_YuHang_module/Hd_YuHang_module.cpp | 0 .../Hd_YuHang_module/Hd_YuHang_module.h | 0 .../{ => algoModules}/Hd_YuHang_module/base.h | 0 .../Hd_YuHang_module/generalJsonParsing.hpp | 0 .../Hd_YuHang_module/nlohmannJson.hpp | 0 BaseModules/hardwareModules/CMakeLists.txt | 11 +++++++++++ .../Hd_CameraModule_HIK_hard_GIGE/CMakeLists.txt | 0 .../Hd_CameraModule_HIK_hard_GIGE.cpp | 0 .../Hd_CameraModule_HIK_hard_GIGE.h | 0 .../Hd_CameraModule_HIK_hard_GIGE/base.h | 0 .../Hd_CameraModule_HIK_hard_PCIE/CMakeLists.txt | 0 .../Hd_CameraModule_HIK_hard_PCIE.cpp | 0 .../Hd_CameraModule_HIK_hard_PCIE.h | 0 .../Hd_CameraModule_HIK_hard_PCIE/base.h | 0 .../Hd_CameraModule_HIK_soft_GIGE/CMakeLists.txt | 0 .../Hd_CameraModule_HIK_soft_GIGE.cpp | 0 .../Hd_CameraModule_HIK_soft_GIGE.h | 0 .../Hd_CameraModule_HIK_soft_GIGE/base.h | 0 .../Hd_CameraModule_readImage/CMakeLists.txt | 0 .../Hd_CameraModule_readImage.cpp | 0 .../Hd_CameraModule_readImage.h | 0 .../Hd_CameraModule_readImage/base.h | 0 .../Hd_SocketModule_FinsTcp/CMakeLists.txt | 0 .../Hd_SocketModule_FinsTcp.cpp | 0 .../Hd_SocketModule_FinsTcp.h | 0 .../Hd_SocketModule_FinsTcp/HslCommunication.dll | Bin .../Hd_SocketModule_FinsTcp/base.h | 0 .../Hd_SocketModule_FinsTcp/camera_cfg-finstcp.json | 0 .../rpc_finsTcp/CMakeLists.txt | 0 .../{ => hardwareModules}/rpc_finsTcp/base.h | 0 .../rpc_finsTcp/json_rpc_server.exe | Bin .../rpc_finsTcp/nlohmannJson.hpp | 0 .../rpc_finsTcp/rpc_finsTcp.cpp | 0 .../{ => hardwareModules}/rpc_finsTcp/rpc_finsTcp.h | 0 69 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 BaseModules/algoModules/CMakeLists.txt rename BaseModules/{ => algoModules}/Hd_FangDing_module/CMakeLists.txt (100%) rename BaseModules/{ => algoModules}/Hd_FangDing_module/Hd_FangDing_module.cpp (100%) rename BaseModules/{ => algoModules}/Hd_FangDing_module/Hd_FangDing_module.h (100%) rename BaseModules/{ => algoModules}/Hd_FangDing_module/base.h (100%) rename BaseModules/{ => algoModules}/Hd_FangDing_module/generalJsonParsing.hpp (100%) rename BaseModules/{ => algoModules}/Hd_FangDing_module/nlohmannJson.hpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/CMakeLists.txt (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Hd_LogicDll_module.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Hd_LogicDll_module.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_camera_thread.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_camera_thread.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_hdataintegration.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_hdataintegration.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_hdataprocess.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_hdataprocess.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_myiothread.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_myiothread.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_processtask.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_processtask.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_taskthread.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/Logic_taskthread.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/base.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/base_Logic.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/nlohmannJson.hpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/rlib/detData.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/rlib/fileManager.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/rlib/rlib_writeCsv.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/struct.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/test.h (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/toolkit.cpp (100%) rename BaseModules/{ => algoModules}/Hd_LogicDll_module/toolkit.h (100%) rename BaseModules/{ => algoModules}/Hd_YuHang_module/CMakeLists.txt (100%) rename BaseModules/{ => algoModules}/Hd_YuHang_module/Hd_YuHang_module.cpp (100%) rename BaseModules/{ => algoModules}/Hd_YuHang_module/Hd_YuHang_module.h (100%) rename BaseModules/{ => algoModules}/Hd_YuHang_module/base.h (100%) rename BaseModules/{ => algoModules}/Hd_YuHang_module/generalJsonParsing.hpp (100%) rename BaseModules/{ => algoModules}/Hd_YuHang_module/nlohmannJson.hpp (100%) create mode 100644 BaseModules/hardwareModules/CMakeLists.txt rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_GIGE/CMakeLists.txt (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.h (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_GIGE/base.h (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_PCIE/CMakeLists.txt (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.h (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_hard_PCIE/base.h (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_soft_GIGE/CMakeLists.txt (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.h (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_HIK_soft_GIGE/base.h (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_readImage/CMakeLists.txt (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_readImage/Hd_CameraModule_readImage.cpp (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_readImage/Hd_CameraModule_readImage.h (100%) rename BaseModules/{ => hardwareModules}/Hd_CameraModule_readImage/base.h (100%) rename BaseModules/{ => hardwareModules}/Hd_SocketModule_FinsTcp/CMakeLists.txt (100%) rename BaseModules/{ => hardwareModules}/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.cpp (100%) rename BaseModules/{ => hardwareModules}/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.h (100%) rename BaseModules/{ => hardwareModules}/Hd_SocketModule_FinsTcp/HslCommunication.dll (100%) rename BaseModules/{ => hardwareModules}/Hd_SocketModule_FinsTcp/base.h (100%) rename BaseModules/{ => hardwareModules}/Hd_SocketModule_FinsTcp/camera_cfg-finstcp.json (100%) rename BaseModules/{ => hardwareModules}/rpc_finsTcp/CMakeLists.txt (100%) rename BaseModules/{ => hardwareModules}/rpc_finsTcp/base.h (100%) rename BaseModules/{ => hardwareModules}/rpc_finsTcp/json_rpc_server.exe (100%) rename BaseModules/{ => hardwareModules}/rpc_finsTcp/nlohmannJson.hpp (100%) rename BaseModules/{ => hardwareModules}/rpc_finsTcp/rpc_finsTcp.cpp (100%) rename BaseModules/{ => hardwareModules}/rpc_finsTcp/rpc_finsTcp.h (100%) diff --git a/BaseModules/CMakeLists.txt b/BaseModules/CMakeLists.txt index 447487d..766f160 100644 --- a/BaseModules/CMakeLists.txt +++ b/BaseModules/CMakeLists.txt @@ -8,4 +8,5 @@ message("OUR_LIBS :" ${OUR_LIBS}) # 遍历子库 foreach(dll ${OUR_LIBS}) add_subdirectory(${dll}) -endforeach(dll ${}) \ No newline at end of file +endforeach(dll ${}) + \ No newline at end of file diff --git a/BaseModules/algoModules/CMakeLists.txt b/BaseModules/algoModules/CMakeLists.txt new file mode 100644 index 0000000..447487d --- /dev/null +++ b/BaseModules/algoModules/CMakeLists.txt @@ -0,0 +1,11 @@ +# CMakeList.txt: 遍历文件夹 添加子项目 + +set(OUR_LIBS "") +SUBDIRENAMES(OUR_LIBS ${CMAKE_CURRENT_SOURCE_DIR} "" OFF) +message("OUR_LIBS :" ${OUR_LIBS}) + + +# 遍历子库 +foreach(dll ${OUR_LIBS}) + add_subdirectory(${dll}) +endforeach(dll ${}) \ No newline at end of file diff --git a/BaseModules/Hd_FangDing_module/CMakeLists.txt b/BaseModules/algoModules/Hd_FangDing_module/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_FangDing_module/CMakeLists.txt rename to BaseModules/algoModules/Hd_FangDing_module/CMakeLists.txt diff --git a/BaseModules/Hd_FangDing_module/Hd_FangDing_module.cpp b/BaseModules/algoModules/Hd_FangDing_module/Hd_FangDing_module.cpp similarity index 100% rename from BaseModules/Hd_FangDing_module/Hd_FangDing_module.cpp rename to BaseModules/algoModules/Hd_FangDing_module/Hd_FangDing_module.cpp diff --git a/BaseModules/Hd_FangDing_module/Hd_FangDing_module.h b/BaseModules/algoModules/Hd_FangDing_module/Hd_FangDing_module.h similarity index 100% rename from BaseModules/Hd_FangDing_module/Hd_FangDing_module.h rename to BaseModules/algoModules/Hd_FangDing_module/Hd_FangDing_module.h diff --git a/BaseModules/Hd_FangDing_module/base.h b/BaseModules/algoModules/Hd_FangDing_module/base.h similarity index 100% rename from BaseModules/Hd_FangDing_module/base.h rename to BaseModules/algoModules/Hd_FangDing_module/base.h diff --git a/BaseModules/Hd_FangDing_module/generalJsonParsing.hpp b/BaseModules/algoModules/Hd_FangDing_module/generalJsonParsing.hpp similarity index 100% rename from BaseModules/Hd_FangDing_module/generalJsonParsing.hpp rename to BaseModules/algoModules/Hd_FangDing_module/generalJsonParsing.hpp diff --git a/BaseModules/Hd_FangDing_module/nlohmannJson.hpp b/BaseModules/algoModules/Hd_FangDing_module/nlohmannJson.hpp similarity index 100% rename from BaseModules/Hd_FangDing_module/nlohmannJson.hpp rename to BaseModules/algoModules/Hd_FangDing_module/nlohmannJson.hpp diff --git a/BaseModules/Hd_LogicDll_module/CMakeLists.txt b/BaseModules/algoModules/Hd_LogicDll_module/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_LogicDll_module/CMakeLists.txt rename to BaseModules/algoModules/Hd_LogicDll_module/CMakeLists.txt diff --git a/BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp b/BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.cpp diff --git a/BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.h b/BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/Hd_LogicDll_module.h rename to BaseModules/algoModules/Hd_LogicDll_module/Hd_LogicDll_module.h diff --git a/BaseModules/Hd_LogicDll_module/Logic_camera_thread.cpp b/BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_camera_thread.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.cpp diff --git a/BaseModules/Hd_LogicDll_module/Logic_camera_thread.h b/BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_camera_thread.h rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_camera_thread.h diff --git a/BaseModules/Hd_LogicDll_module/Logic_hdataintegration.cpp b/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_hdataintegration.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.cpp diff --git a/BaseModules/Hd_LogicDll_module/Logic_hdataintegration.h b/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_hdataintegration.h rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataintegration.h diff --git a/BaseModules/Hd_LogicDll_module/Logic_hdataprocess.cpp b/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_hdataprocess.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.cpp diff --git a/BaseModules/Hd_LogicDll_module/Logic_hdataprocess.h b/BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_hdataprocess.h rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_hdataprocess.h diff --git a/BaseModules/Hd_LogicDll_module/Logic_myiothread.cpp b/BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_myiothread.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.cpp diff --git a/BaseModules/Hd_LogicDll_module/Logic_myiothread.h b/BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_myiothread.h rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_myiothread.h diff --git a/BaseModules/Hd_LogicDll_module/Logic_processtask.cpp b/BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_processtask.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.cpp diff --git a/BaseModules/Hd_LogicDll_module/Logic_processtask.h b/BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_processtask.h rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_processtask.h diff --git a/BaseModules/Hd_LogicDll_module/Logic_taskthread.cpp b/BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_taskthread.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.cpp diff --git a/BaseModules/Hd_LogicDll_module/Logic_taskthread.h b/BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/Logic_taskthread.h rename to BaseModules/algoModules/Hd_LogicDll_module/Logic_taskthread.h diff --git a/BaseModules/Hd_LogicDll_module/base.h b/BaseModules/algoModules/Hd_LogicDll_module/base.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/base.h rename to BaseModules/algoModules/Hd_LogicDll_module/base.h diff --git a/BaseModules/Hd_LogicDll_module/base_Logic.h b/BaseModules/algoModules/Hd_LogicDll_module/base_Logic.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/base_Logic.h rename to BaseModules/algoModules/Hd_LogicDll_module/base_Logic.h diff --git a/BaseModules/Hd_LogicDll_module/nlohmannJson.hpp b/BaseModules/algoModules/Hd_LogicDll_module/nlohmannJson.hpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/nlohmannJson.hpp rename to BaseModules/algoModules/Hd_LogicDll_module/nlohmannJson.hpp diff --git a/BaseModules/Hd_LogicDll_module/rlib/detData.h b/BaseModules/algoModules/Hd_LogicDll_module/rlib/detData.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/rlib/detData.h rename to BaseModules/algoModules/Hd_LogicDll_module/rlib/detData.h diff --git a/BaseModules/Hd_LogicDll_module/rlib/fileManager.h b/BaseModules/algoModules/Hd_LogicDll_module/rlib/fileManager.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/rlib/fileManager.h rename to BaseModules/algoModules/Hd_LogicDll_module/rlib/fileManager.h diff --git a/BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp b/BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.cpp diff --git a/BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h b/BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h rename to BaseModules/algoModules/Hd_LogicDll_module/rlib/rlib_writeCsv.h diff --git a/BaseModules/Hd_LogicDll_module/struct.h b/BaseModules/algoModules/Hd_LogicDll_module/struct.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/struct.h rename to BaseModules/algoModules/Hd_LogicDll_module/struct.h diff --git a/BaseModules/Hd_LogicDll_module/test.h b/BaseModules/algoModules/Hd_LogicDll_module/test.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/test.h rename to BaseModules/algoModules/Hd_LogicDll_module/test.h diff --git a/BaseModules/Hd_LogicDll_module/toolkit.cpp b/BaseModules/algoModules/Hd_LogicDll_module/toolkit.cpp similarity index 100% rename from BaseModules/Hd_LogicDll_module/toolkit.cpp rename to BaseModules/algoModules/Hd_LogicDll_module/toolkit.cpp diff --git a/BaseModules/Hd_LogicDll_module/toolkit.h b/BaseModules/algoModules/Hd_LogicDll_module/toolkit.h similarity index 100% rename from BaseModules/Hd_LogicDll_module/toolkit.h rename to BaseModules/algoModules/Hd_LogicDll_module/toolkit.h diff --git a/BaseModules/Hd_YuHang_module/CMakeLists.txt b/BaseModules/algoModules/Hd_YuHang_module/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_YuHang_module/CMakeLists.txt rename to BaseModules/algoModules/Hd_YuHang_module/CMakeLists.txt diff --git a/BaseModules/Hd_YuHang_module/Hd_YuHang_module.cpp b/BaseModules/algoModules/Hd_YuHang_module/Hd_YuHang_module.cpp similarity index 100% rename from BaseModules/Hd_YuHang_module/Hd_YuHang_module.cpp rename to BaseModules/algoModules/Hd_YuHang_module/Hd_YuHang_module.cpp diff --git a/BaseModules/Hd_YuHang_module/Hd_YuHang_module.h b/BaseModules/algoModules/Hd_YuHang_module/Hd_YuHang_module.h similarity index 100% rename from BaseModules/Hd_YuHang_module/Hd_YuHang_module.h rename to BaseModules/algoModules/Hd_YuHang_module/Hd_YuHang_module.h diff --git a/BaseModules/Hd_YuHang_module/base.h b/BaseModules/algoModules/Hd_YuHang_module/base.h similarity index 100% rename from BaseModules/Hd_YuHang_module/base.h rename to BaseModules/algoModules/Hd_YuHang_module/base.h diff --git a/BaseModules/Hd_YuHang_module/generalJsonParsing.hpp b/BaseModules/algoModules/Hd_YuHang_module/generalJsonParsing.hpp similarity index 100% rename from BaseModules/Hd_YuHang_module/generalJsonParsing.hpp rename to BaseModules/algoModules/Hd_YuHang_module/generalJsonParsing.hpp diff --git a/BaseModules/Hd_YuHang_module/nlohmannJson.hpp b/BaseModules/algoModules/Hd_YuHang_module/nlohmannJson.hpp similarity index 100% rename from BaseModules/Hd_YuHang_module/nlohmannJson.hpp rename to BaseModules/algoModules/Hd_YuHang_module/nlohmannJson.hpp diff --git a/BaseModules/hardwareModules/CMakeLists.txt b/BaseModules/hardwareModules/CMakeLists.txt new file mode 100644 index 0000000..447487d --- /dev/null +++ b/BaseModules/hardwareModules/CMakeLists.txt @@ -0,0 +1,11 @@ +# CMakeList.txt: 遍历文件夹 添加子项目 + +set(OUR_LIBS "") +SUBDIRENAMES(OUR_LIBS ${CMAKE_CURRENT_SOURCE_DIR} "" OFF) +message("OUR_LIBS :" ${OUR_LIBS}) + + +# 遍历子库 +foreach(dll ${OUR_LIBS}) + add_subdirectory(${dll}) +endforeach(dll ${}) \ No newline at end of file diff --git a/BaseModules/Hd_CameraModule_HIK_hard_GIGE/CMakeLists.txt b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_GIGE/CMakeLists.txt rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/CMakeLists.txt diff --git a/BaseModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.cpp diff --git a/BaseModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.h b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.h similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.h rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/Hd_CameraModule_HIK_hard_GIGE.h diff --git a/BaseModules/Hd_CameraModule_HIK_hard_GIGE/base.h b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/base.h similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_GIGE/base.h rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_GIGE/base.h diff --git a/BaseModules/Hd_CameraModule_HIK_hard_PCIE/CMakeLists.txt b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_PCIE/CMakeLists.txt rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/CMakeLists.txt diff --git a/BaseModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.cpp diff --git a/BaseModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.h b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.h similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.h rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/Hd_CameraModule_HIK_hard_PCIE.h diff --git a/BaseModules/Hd_CameraModule_HIK_hard_PCIE/base.h b/BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/base.h similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_hard_PCIE/base.h rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_hard_PCIE/base.h diff --git a/BaseModules/Hd_CameraModule_HIK_soft_GIGE/CMakeLists.txt b/BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_soft_GIGE/CMakeLists.txt rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/CMakeLists.txt diff --git a/BaseModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp b/BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.cpp diff --git a/BaseModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.h b/BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.h similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.h rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/Hd_CameraModule_HIK_soft_GIGE.h diff --git a/BaseModules/Hd_CameraModule_HIK_soft_GIGE/base.h b/BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/base.h similarity index 100% rename from BaseModules/Hd_CameraModule_HIK_soft_GIGE/base.h rename to BaseModules/hardwareModules/Hd_CameraModule_HIK_soft_GIGE/base.h diff --git a/BaseModules/Hd_CameraModule_readImage/CMakeLists.txt b/BaseModules/hardwareModules/Hd_CameraModule_readImage/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_CameraModule_readImage/CMakeLists.txt rename to BaseModules/hardwareModules/Hd_CameraModule_readImage/CMakeLists.txt diff --git a/BaseModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.cpp b/BaseModules/hardwareModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.cpp similarity index 100% rename from BaseModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.cpp rename to BaseModules/hardwareModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.cpp diff --git a/BaseModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.h b/BaseModules/hardwareModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.h similarity index 100% rename from BaseModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.h rename to BaseModules/hardwareModules/Hd_CameraModule_readImage/Hd_CameraModule_readImage.h diff --git a/BaseModules/Hd_CameraModule_readImage/base.h b/BaseModules/hardwareModules/Hd_CameraModule_readImage/base.h similarity index 100% rename from BaseModules/Hd_CameraModule_readImage/base.h rename to BaseModules/hardwareModules/Hd_CameraModule_readImage/base.h diff --git a/BaseModules/Hd_SocketModule_FinsTcp/CMakeLists.txt b/BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/CMakeLists.txt similarity index 100% rename from BaseModules/Hd_SocketModule_FinsTcp/CMakeLists.txt rename to BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/CMakeLists.txt diff --git a/BaseModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.cpp b/BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.cpp similarity index 100% rename from BaseModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.cpp rename to BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.cpp diff --git a/BaseModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.h b/BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.h similarity index 100% rename from BaseModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.h rename to BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/Hd_SocketModule_FinsTcp.h diff --git a/BaseModules/Hd_SocketModule_FinsTcp/HslCommunication.dll b/BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/HslCommunication.dll similarity index 100% rename from BaseModules/Hd_SocketModule_FinsTcp/HslCommunication.dll rename to BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/HslCommunication.dll diff --git a/BaseModules/Hd_SocketModule_FinsTcp/base.h b/BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/base.h similarity index 100% rename from BaseModules/Hd_SocketModule_FinsTcp/base.h rename to BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/base.h diff --git a/BaseModules/Hd_SocketModule_FinsTcp/camera_cfg-finstcp.json b/BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/camera_cfg-finstcp.json similarity index 100% rename from BaseModules/Hd_SocketModule_FinsTcp/camera_cfg-finstcp.json rename to BaseModules/hardwareModules/Hd_SocketModule_FinsTcp/camera_cfg-finstcp.json diff --git a/BaseModules/rpc_finsTcp/CMakeLists.txt b/BaseModules/hardwareModules/rpc_finsTcp/CMakeLists.txt similarity index 100% rename from BaseModules/rpc_finsTcp/CMakeLists.txt rename to BaseModules/hardwareModules/rpc_finsTcp/CMakeLists.txt diff --git a/BaseModules/rpc_finsTcp/base.h b/BaseModules/hardwareModules/rpc_finsTcp/base.h similarity index 100% rename from BaseModules/rpc_finsTcp/base.h rename to BaseModules/hardwareModules/rpc_finsTcp/base.h diff --git a/BaseModules/rpc_finsTcp/json_rpc_server.exe b/BaseModules/hardwareModules/rpc_finsTcp/json_rpc_server.exe similarity index 100% rename from BaseModules/rpc_finsTcp/json_rpc_server.exe rename to BaseModules/hardwareModules/rpc_finsTcp/json_rpc_server.exe diff --git a/BaseModules/rpc_finsTcp/nlohmannJson.hpp b/BaseModules/hardwareModules/rpc_finsTcp/nlohmannJson.hpp similarity index 100% rename from BaseModules/rpc_finsTcp/nlohmannJson.hpp rename to BaseModules/hardwareModules/rpc_finsTcp/nlohmannJson.hpp diff --git a/BaseModules/rpc_finsTcp/rpc_finsTcp.cpp b/BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.cpp similarity index 100% rename from BaseModules/rpc_finsTcp/rpc_finsTcp.cpp rename to BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.cpp diff --git a/BaseModules/rpc_finsTcp/rpc_finsTcp.h b/BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.h similarity index 100% rename from BaseModules/rpc_finsTcp/rpc_finsTcp.h rename to BaseModules/hardwareModules/rpc_finsTcp/rpc_finsTcp.h