From cdfb8eb2a956d25d688033be735f4741b2ab58bd Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 09:48:42 +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 | 120 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 57 insertions(+), 63 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
index 0528f16..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/
@@ -66,21 +66,21 @@
)
link_directories(
- #glog
- ../../BasicPlatForm/libs/glog/lib
/usr/local/cuda/lib64
- ../../BasicPlatForm/libs/openssl/lib/
- ../../BasicPlatForm/libs/Ice-3.7.0/lib64
- ../../BasicPlatForm/libs/opencv/lib
- ../../BasicPlatForm/libs/ffmpeg/lib
- ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
- ../../BasicPlatForm/libs/crul/lib
- ../../BasicPlatForm/libs/jsoncpp/lib
- ../../BasicPlatForm/libs/libuuid/lib
+ #glog
+ ../../../BasicPlatForm/libs/glog/lib
+ ../../../BasicPlatForm/libs/openssl/lib/
+ ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+ ../../../BasicPlatForm/libs/opencv/lib
+ ../../../BasicPlatForm/libs/ffmpeg/lib
+ ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu
+ ../../../BasicPlatForm/libs/crul/lib
+ ../../../BasicPlatForm/libs/jsoncpp/lib
+ ../../../BasicPlatForm/libs/libuuid/lib
# ../../BasicPlatForm/libs/erlang/erl_interface/libs
- ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
- ../../BasicPlatForm/libs/libuuid/lib
+ ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
+ ../../../BasicPlatForm/libs/libuuid/lib
/usr/lib/erlang/lib/erl_interface-3.8.2/lib/
)
@@ -98,54 +98,48 @@
AlarmServer.hpp
FaceDBCompareServer.cpp
FaceDBCompareServer.h
- ../../BasicPlatForm/basic/util/thread/MultiThread.cpp
- ../../BasicPlatForm/basic/util/thread/MultiThread.h
- ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
- ../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
- ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
- ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.h
+ ../../../BasicPlatForm/basic/util/thread/MultiThread.cpp
+ ../../../BasicPlatForm/basic/util/thread/MultiThread.h
+ ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+ ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
+ ../../../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
- ../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
+ ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
+ ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
# ../../BasicPlatForm/basic/util/ShareMemory/SemTool.cpp
- ../../../Erlang/syncDBTool/ErlangDbTool.cpp
+ ../../syncDBTool/ErlangDbTool.cpp
# ../../../Erlang/syncDBTool/ShareMemoryTool.hpp
# ../../../Erlang/syncDBTool/SyncDB.hpp
)
-
-#add_executable(FaceSearchServerResourcesTest
-# FaceSearchServerResourcesTest.cpp
-# )
target_link_libraries(${PROJECT_NAME}
${LIBS}
)
-#target_link_libraries(FaceSearchServerResourcesTest
+#add_executable(SearchFaceTest
+# Cleint.cpp
+# ./rpc/FaceSearchServer.cpp
+# ./CasiaFaceWrapper/CasiaFaceWrapperN.cpp
+# )
+#target_link_libraries(SearchFaceTest
+# opencv_world
+# glog
+# curl
+# IceStorm
+# Ice
+# jsoncpp
+# uuid
+# THFaceImage
+# THFacialPos
+# THFaceProperty
+# THFeature
# pthread
# )
-add_executable(SearchFaceTest
- Cleint.cpp
- ./rpc/FaceSearchServer.cpp
- ./CasiaFaceWrapper/CasiaFaceWrapperN.cpp
- )
-target_link_libraries(SearchFaceTest
- opencv_world
- glog
- curl
- IceStorm
- Ice
- jsoncpp
- uuid
- THFaceImage
- THFacialPos
- THFaceProperty
- THFeature
- pthread
- )
add_subdirectory(LoadFeaTool)
--
Gitblit v1.8.0