From 1b7365bcde96fbe139636ef68fbbfb25ba6b16e2 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 12 Apr 2022 11:29:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- docker/Dockerfile.satellite | 3 +-- modules/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 70fba44..f206750 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ add_compile_options(-Wall -std=c++11 -O2 -g) link_directories(${PROJECT_SOURCE_DIR}/lib) link_directories(/usr/local/lib) -list(APPEND ALL_LINKER_LIBS mk_api ZLToolKit dl ${3RDPARTY_LIBS} ${OpenCV_LIBS} pthread hv models) +list(APPEND ALL_LINKER_LIBS ZLToolKit dl ${3RDPARTY_LIBS} ${OpenCV_LIBS} pthread models) # 指定生成的目标 add_executable(main ${DIR_SRCS}) diff --git a/docker/Dockerfile.satellite b/docker/Dockerfile.satellite index 9bd759c..24be558 100644 --- a/docker/Dockerfile.satellite +++ b/docker/Dockerfile.satellite @@ -6,8 +6,7 @@ ARG with_satellite_code=yes RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - cmake \ - libmysqlclient-dev \ + libmysqlclient-dev build-essential cmake make vim \ libssl-dev \ libgoogle-glog-dev \ libsqlite3-dev \ diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index d3b5795..7f04b20 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -83,4 +83,4 @@ endforeach() add_library(models SHARED ${srcs}) install(TARGETS models LIBRARY DESTINATION lib) -target_link_libraries(models ${3RDPARTY_LIBS} rt dl pthread ZLToolKit hv ) +target_link_libraries(models ${3RDPARTY_LIBS} rt dl pthread ZLToolKit )