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/FaceSearchServer/CMakeLists.txt | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt index 726cbc4..8900ba4 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/ -- Gitblit v1.8.0