From ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:12:15 +0800
Subject: [PATCH] Merge svn 3352
---
QiaoJiaSystem/YoloServer/CMakeLists.txt | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/QiaoJiaSystem/YoloServer/CMakeLists.txt b/QiaoJiaSystem/YoloServer/CMakeLists.txt
index de53fcc..a706b75 100644
--- a/QiaoJiaSystem/YoloServer/CMakeLists.txt
+++ b/QiaoJiaSystem/YoloServer/CMakeLists.txt
@@ -22,49 +22,50 @@
)
include_directories(
./rpc
- ../../BasicPlatForm
- ../../BasicPlatForm/libs/opencv/include
- ../../BasicPlatForm/libs/jsoncpp/include
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/ffmpeg/include
- ../../BasicPlatForm/libs/DarkNet/include
+ ../../../BasicPlatForm
+ ../../../BasicPlatForm/libs/opencv/include
+ ../../../BasicPlatForm/libs/jsoncpp/include
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/ffmpeg/include
+ ../../../BasicPlatForm/libs/DarkNet/include
/usr/local/cuda/include/
/usr/include/x86_64-linux-gnu/qt5
#glog
- ../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/glog/include
)
link_directories(
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/jsoncpp/lib
- ../../BasicPlatForm/libs/openssl/lib/
- ../../BasicPlatForm/libs/Ice-3.7.0/lib64
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/DarkNet/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/openssl/lib/
+ ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/DarkNet/lib
#glog
- ../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/glog/lib
)
link_directories(
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/DarkNet
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/DarkNet
)
link_directories(
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/DarkNet/lib
- ../../BasicPlatForm/libs/ffmpeg/lib
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/DarkNet/lib
+ ../../../BasicPlatForm/libs/ffmpeg/lib
)
add_executable(${PROJECT_NAME}
main.cpp
YoloDetectServerI.cpp
rpc/YoloServer.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
)
target_link_libraries(${PROJECT_NAME}
@@ -87,6 +88,7 @@
# ../../BasicPlatForm/basic/pipe_element/ImageShowElement.h
# ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.cpp
# ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoCaptureElement.h
+# ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
# rpc/YoloServer.cpp
# YoloDetectClientTest.cpp
# YoloRpcElement.cpp
--
Gitblit v1.8.0