From be058e6bb75f7ac0fd579449673ff6d467b4dc55 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 17 十二月 2018 20:35:50 +0800
Subject: [PATCH] 修改CMakeLists.txt适应项目结构变更,暂未测试编译

---
 QiaoJiaSystem/FaceSearchServer/CMakeLists.txt |   83 +++++++++++++++++++----------------------
 1 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
index 0528f16..726cbc4 100644
--- a/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceSearchServer/CMakeLists.txt
@@ -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/cpu
+    ../../../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,47 @@
     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
 
 
     ../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