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/FaceDetectServer/CMakeLists.txt | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
index 1160b13..b4b8421 100644
--- a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
@@ -21,43 +21,46 @@
)
include_directories(
./rpc
- ../../BasicPlatForm
- ../../BasicPlatForm/libs/opencv/include
- ../../BasicPlatForm/libs/jsoncpp/include
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/ffmpeg/include
- ../../BasicPlatForm/wrapper/casia/include
- ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
+ ../../../BasicPlatForm
+ ../../../BasicPlatForm/libs/opencv/include
+ ../../../BasicPlatForm/libs/jsoncpp/include
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/ffmpeg/include
+ ../../../BasicPlatForm/wrapper/casia/include
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
/usr/include/x86_64-linux-gnu/qt5
#glog
- ../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/glog/include
)
link_directories(
#glog
- ../../BasicPlatForm/libs/glog/lib
- ../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/openssl/lib/
- ../../BasicPlatForm/libs/Ice-3.7.0/lib64
- ../../BasicPlatForm/libs/openssl/lib
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
+ ../../../BasicPlatForm/libs/openssl/lib/
+ ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+ ../../../BasicPlatForm/libs/openssl/lib
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
)
add_executable(${PROJECT_NAME}
main_detect.cpp
FaceDetectServerI.cpp
rpc/FaceServer.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
)
add_executable(FaceDetectResourcesTest
FaceDetectResourcesTest.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
)
add_executable(FaceExtractServer
main_extract.cpp
FaceExtractServerI.cpp
rpc/FaceServer.cpp
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
)
target_link_libraries(${PROJECT_NAME}
--
Gitblit v1.8.0