From a9e9e90b0c0a8fa7f0b78b29101a3dc13a021a5d Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 04 一月 2019 11:01:50 +0800
Subject: [PATCH] Merge branch 'master' into Develop
---
QiaoJiaSystem/FaceDetectServer/CMakeLists.txt | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
index 1160b13..918457d 100644
--- a/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceDetectServer/CMakeLists.txt
@@ -21,28 +21,28 @@
)
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}
--
Gitblit v1.8.0