diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..b3ffbe7 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ +# 更新日志 + + +## v0.0.1.20240912_alpha + +**在之前写的代码基础上正式建立此项目文件,后续将在此项目上进行迭代开发** +### ⭐️Features +- 根据配置文件启动光谱相机并不断保存光谱数据到文件夹 +- 自动点击选择光谱相机 +- 可打包生成生产环境中的文件 \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 524204e..01aa1db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,13 +22,13 @@ include_directories(${PROJECT_SOURCE_DIR}/include) #要链接的库文件所在的路径 -link_directories(${PROJECT_SOURCE_DIR}/lib) +link_directories (${PROJECT_SOURCE_DIR}/lib) add_library(SpectralCameraLib "${PROJECT_SOURCE_DIR}/src/spectral_camera.cpp") add_library(DisplayLib "${PROJECT_SOURCE_DIR}/src/display.cpp") add_library(DataPreprocessLib "${PROJECT_SOURCE_DIR}/src/data_preprocess.cpp") add_library(VisibleLightCameraLIB "${PROJECT_SOURCE_DIR}/src/visible_light_camera.cpp") -link_directories(${PROJECT_SOURCE_DIR}/../CompliteEnv/Python37) +link_directories (${PROJECT_SOURCE_DIR}/../CompliteEnv/Python37) #编译${PROJECT_SOURCE_DIR}/src/main.cpp在这个cpp文件为名为HelloWorld可执行文件 @@ -46,3 +46,34 @@ target_link_libraries(${PROJ_NAME} PUBLIC DisplayLib) target_link_libraries(${PROJ_NAME} PUBLIC opencv_core490 opencv_highgui490 opencv_imgproc490 opencv_photo490 opencv_imgcodecs490 opencv_video490 opencv_videoio490) target_link_libraries(${PROJ_NAME} PUBLIC DataPreprocessLib) + + + +# 设置RPATH(运行时库搜索路径)(仅linux下可用) +# set_target_properties(${PROJ_NAME} PROPERTIES +# INSTALL_RPATH "$ORIGIN/../lib" +# ) + +# set(CMAKE_INSTALL_RPATH "$origin/../lib") + +# 安装规则 +install(TARGETS ${PROJECT_NAME} DESTINATION .) +# install(DIRECTORY lib/* DESTINATION .) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/ + DESTINATION . + USE_SOURCE_PERMISSIONS + FILES_MATCHING PATTERN "*") + +# 包括 CPack 打包配置 +# include(InstallRequiredSystemLibraries) + + +if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) + set(CPACK_PACKAGE_VERSION_MAJOR "${PROJ_VERSION_MAJOR}") + set(CPACK_PACKAGE_VERSION_MINOR "${PROJ_VERSION_MINOR}") + set(CPACK_PACKAGE_VERSION_PATCH "${PROJ_VERSION_PATCH}") + set(CPACK_GENERATOR "ZIP") + include(CPack) +endif() + + diff --git a/README.md b/README.md index 5be4dca..6ee2872 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,5 @@ - run.bat p : Pack 打包项目 获取最新版本 -http://10.8.8.8:3000/api/v1/repos/zhanpeng/SEMS-data-collection/releases/latest?token=e9aaae4b5f7756d0a2977764dbcbdfeb68bb2e13 \ No newline at end of file +http://10.8.8.8:3000/api/v1/repos/zhanpeng/SEMS-data-collection/releases/latest?token=e9aaae4b5f7756d0a2977764dbcbdfeb68bb2e13 +https://gitea.zhanpeng.life/api/v1/repos/zhanpeng/SEMS-data-collection/releases/latest?token=e9aaae4b5f7756d0a2977764dbcbdfeb68bb2e13 \ No newline at end of file diff --git a/lib/DeviceSelection.exe b/lib/DeviceSelection.exe deleted file mode 100644 index a5b77f8..0000000 Binary files a/lib/DeviceSelection.exe and /dev/null differ diff --git a/lib/SpectralCameraCheck.exe b/lib/SpectralCameraCheck.exe deleted file mode 100644 index 469e3f7..0000000 Binary files a/lib/SpectralCameraCheck.exe and /dev/null differ diff --git a/lib/example1-x64.exe b/lib/example1-x64.exe deleted file mode 100644 index 81ee13c..0000000 Binary files a/lib/example1-x64.exe and /dev/null differ diff --git a/lib/example2-x64.exe b/lib/example2-x64.exe deleted file mode 100644 index ded9990..0000000 Binary files a/lib/example2-x64.exe and /dev/null differ diff --git a/lib/example3-x64.exe b/lib/example3-x64.exe deleted file mode 100644 index 739ced8..0000000 Binary files a/lib/example3-x64.exe and /dev/null differ diff --git a/lib/libgcc_s_seh-1.dll b/lib/libgcc_s_seh-1.dll new file mode 100644 index 0000000..838f946 Binary files /dev/null and b/lib/libgcc_s_seh-1.dll differ diff --git a/lib/libstdc++-6.dll b/lib/libstdc++-6.dll new file mode 100644 index 0000000..f5e4fec Binary files /dev/null and b/lib/libstdc++-6.dll differ diff --git a/run.bat b/run.bat index 0967d5a..2537e3c 100644 --- a/run.bat +++ b/run.bat @@ -55,9 +55,9 @@ if "%1"=="c" ( @REM run.bat e : 打包 -if "%1"=="p" ( - @REM 判断环境变量中是否存在编译所需要的文件夹,如果没有,就添加到环境变量 - +if "%1"=="p" ( + @REM 判断是否存在build文件夹,若存在就删除 + call:remove_build_dir @REM 编译生成Makefile cmake -B build -G "MinGW Makefiles" @REM 编译生成可执行程序