From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/FaceSearchServer/CMakeLists.txt | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
index 726cbc4..26f313c 100644
--- a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
@@ -32,31 +32,31 @@
./CasiaFaceWrapper
#glog
- ../../BasicPlatForm/libs/glog/include
+ ../../../BasicPlatForm/libs/glog/include
../LocalDBTool
- ../../BasicPlatForm
- ../../BasicPlatForm/libs/crul/include
- ../../BasicPlatForm/libs/opencv/include
- ../../BasicPlatForm/libs/Ice-3.7.0/include
- ../../BasicPlatForm/libs/ffmpeg/include
- ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
+ ../../../BasicPlatForm
+ ../../../BasicPlatForm/libs/crul/include
+ ../../../BasicPlatForm/libs/opencv/include
+ ../../../BasicPlatForm/libs/Ice-3.7.0/include
+ ../../../BasicPlatForm/libs/ffmpeg/include
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
# ../../BasicPlatForm/libs/erlang/erl_interface/include
- ../../BasicPlatForm/libs/jsoncpp/include
- ../../BasicPlatForm/libs/crul/include
- ../../BasicPlatForm/libs/libuuid/include/
- ../../BasicPlatForm/basic/util/curl/
- ../../BasicPlatForm/basic/util/ShareMemory/
- ../../BasicPlatForm/basic/db/Elasticsearch/
- ../../BasicPlatForm/wrapper/casia/include
- ../../BasicPlatForm/libs/libboost/include
+ ../../../BasicPlatForm/libs/jsoncpp/include
+ ../../../BasicPlatForm/libs/crul/include
+ ../../../BasicPlatForm/libs/libuuid/include/
+ ../../../BasicPlatForm/basic/util/curl/
+ ../../../BasicPlatForm/basic/util/ShareMemory/
+ ../../../BasicPlatForm/basic/db/Elasticsearch/
+ ../../../BasicPlatForm/wrapper/casia/include
+ ../../../BasicPlatForm/libs/libboost/include
- ../../../Erlang/syncDBTool/
+ ../../syncDBTool/
- ../../BasicPlatForm/basic/db/sqlite/
- ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+ ../../../BasicPlatForm/basic/db/sqlite/
+ ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
/usr/include/x86_64-linux-gnu/qt5
/usr/include/x86_64-linux-gnu/qt5/QtCore/
@@ -73,7 +73,7 @@
../../../BasicPlatForm/libs/Ice-3.7.0/lib64
../../../BasicPlatForm/libs/opencv/lib
../../../BasicPlatForm/libs/ffmpeg/lib
- ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
../../../BasicPlatForm/libs/crul/lib
../../../BasicPlatForm/libs/jsoncpp/lib
../../../BasicPlatForm/libs/libuuid/lib
@@ -105,6 +105,7 @@
../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.h
+ ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
../LocalDBTool/SqliteFaceEncap.cpp
../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
--
Gitblit v1.8.0