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/LoadFeaTool/CMakeLists.txt |   12 
 QiaoJiaSystem/DataManagerServer/CMakeLists.txt            |   56 ++++----
 QiaoJiaSystem/FaceSearchServer/CMakeLists.txt             |   83 +++++------
 QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt            |   84 +++++------
 QiaoJiaSystem/StructureApp/CMakeLists.txt                 |   81 +++++-----
 QiaoJiaSystem/RecordVideo/CMakeLists.txt                  |   50 +++---
 QiaoJiaSystem/CMakeLists.txt                              |    8 
 QiaoJiaSystem/RapidStructureApp/CMakeLists.txt            |   30 ++--
 8 files changed, 197 insertions(+), 207 deletions(-)

diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index 8dcb3f2..2da842a 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -8,10 +8,10 @@
 
 include_directories(
     ./
-    ../BasicPlatForm/
-    ../BasicPlatForm/libs/jsoncpp/include
-    ../BasicPlatForm/libs/opencv/include
-    ../BasicPlatForm/libs/libuuid/include
+    ../../BasicPlatForm/
+    ../../BasicPlatForm/libs/jsoncpp/include
+    ../../BasicPlatForm/libs/opencv/include
+    ../../BasicPlatForm/libs/libuuid/include
 )
 
 add_subdirectory(StructureApp)
diff --git a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
index dd5cd26..3502803 100644
--- a/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
+++ b/QiaoJiaSystem/DataManagerServer/CMakeLists.txt
@@ -16,31 +16,31 @@
 
     #
     ../LocalDBTool/
-    ../../BasicPlatForm/basic/db/sqlite/
-    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000/
+    ../../../BasicPlatForm/basic/db/sqlite/
+    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000/
 
-    ../../BasicPlatForm
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
-    ../../BasicPlatForm/libs/jsoncpp/include
-    ../../BasicPlatForm/libs/crul/include
-    ../../BasicPlatForm/libs/FastDFS/include
-    ../../BasicPlatForm/libs/FastDFS/include/fastdfs
-    ../../BasicPlatForm/libs/FastDFS/include/fastcommon
-    ../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/libs/crul/include
+    ../../../BasicPlatForm/libs/FastDFS/include
+    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+    ../../../BasicPlatForm/libs/ffmpeg/include
 
-    ../../BasicPlatForm/basic/util/fastdfs/
-    ../../BasicPlatForm/basic/util/curl/
-    ../../BasicPlatForm/basic/http_server/
-    ../../BasicPlatForm/libs/libuuid/include
-    ../../BasicPlatForm/libs/uniview/include
+    ../../../BasicPlatForm/basic/util/fastdfs/
+    ../../../BasicPlatForm/basic/util/curl/
+    ../../../BasicPlatForm/basic/http_server/
+    ../../../BasicPlatForm/libs/libuuid/include
+    ../../../BasicPlatForm/libs/uniview/include
 
     ../../../Erlang/syncDBTool
 
-    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
+    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
 
-    ../../BasicPlatForm/libs/libboost/include
+    ../../../BasicPlatForm/libs/libboost/include
 
     /usr/include/x86_64-linux-gnu/qt5
     /usr/include/x86_64-linux-gnu/qt5/QtCore/
@@ -48,7 +48,7 @@
 
 
     #glog
-    ../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/glog/include
 
 )
 
@@ -89,21 +89,21 @@
     ./AppPipeController.cpp
     ./AppPipeController.h
 
-    ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
-    ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
-    ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+    ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
+    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
     ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
     ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
 
 
-    ../../../Erlang/syncDBTool/ErlangDbTool.cpp
+    ../../syncDBTool/ErlangDbTool.cpp
     #
     ../LocalDBTool/GetUUId.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
     )
 
 target_link_libraries(DataWebServer
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)
diff --git a/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt b/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt
index a96a094..ca72d82 100644
--- a/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt
+++ b/QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt
@@ -8,23 +8,23 @@
 include_directories(
     /home/ps/boost_1_68_0
     /usr/include/
-    ../../../BasicPlatForm/libs/glog/include
-    ../../../BasicPlatForm/libs/jsoncpp/include
-    ../../../BasicPlatForm/basic/util/ShareMemory/
+    ../../../../BasicPlatForm/libs/glog/include
+    ../../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../../BasicPlatForm/basic/util/ShareMemory/
     ../../../../Erlang/syncDBTool
 )
 
 link_directories(
     /usr/lib/erlang/lib/erl_interface-3.8.2/lib/
-    ../../../BasicPlatForm/libs/glog/lib
-    ../../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../../BasicPlatForm/libs/glog/lib
+    ../../../../BasicPlatForm/libs/jsoncpp/lib
 )
 
 
 add_executable(syncDBClient
     main.cpp
 
-    ../../../../Erlang/syncDBTool/ErlangDbTool.cpp
+    ../../../syncDBTool/ErlangDbTool.cpp
     #    ../../../BasicPlatForm/basic/util/ShareMemory/SemTool.cpp
     )
 
diff --git a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt b/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
index a96af7a..a37d457 100644
--- a/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/RapidStructureApp/CMakeLists.txt
@@ -12,10 +12,10 @@
     VideoChangeScore.cpp
     TriggerElement.cpp
     AppController.cpp
-    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
-    ../../BasicPlatForm/basic/pipe/TimerElement.cpp
-    ../../BasicPlatForm/basic/util/file/FileUtil.cpp
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
+    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
+    ../../../BasicPlatForm/basic/util/file/FileUtil.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
     )
 
 SET(LIBS
@@ -37,21 +37,21 @@
     ../YoloServer/rpc
     ../FaceDetectServer/rpc
     ../StructureApp
-    ../../BasicPlatForm
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/ffmpeg/include
-    ../../BasicPlatForm/libs/jsoncpp/include
-    ../../BasicPlatForm/basic/pipe/
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/basic/pipe/
     /usr/include/x86_64-linux-gnu/qt5
 )
 
 link_directories(
-    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
-    ../../BasicPlatForm/libs/openssl/lib
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/ffmpeg/lib
-    ../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+    ../../../BasicPlatForm/libs/openssl/lib
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
 )
 
 add_executable(${PROJECT_NAME}
diff --git a/QiaoJiaSystem/RecordVideo/CMakeLists.txt b/QiaoJiaSystem/RecordVideo/CMakeLists.txt
index 5aa4879..732118d 100644
--- a/QiaoJiaSystem/RecordVideo/CMakeLists.txt
+++ b/QiaoJiaSystem/RecordVideo/CMakeLists.txt
@@ -17,11 +17,11 @@
     ../VideoServer/QiaoJia/DB/LDBTool.cpp
     ./VideoRecorder.cpp
     ./CommonFFmpegFunc.hpp
-    ../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
-    ../../BasicPlatForm/basic/util/app/AppConfig.h
-    ../../BasicPlatForm/basic/util/app/AppPreference.hpp
-    ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
-    ../../BasicPlatForm/basic/pipe/TimerElement.cpp
+    ../../../BasicPlatForm/basic/util/opencv/CvUtil.cpp
+    ../../../BasicPlatForm/basic/util/app/AppConfig.h
+    ../../../BasicPlatForm/basic/util/app/AppPreference.hpp
+    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
     )
 
 SET(LIBS
@@ -46,35 +46,35 @@
 
 include_directories(
     ./rpc
-    ../../BasicPlatForm
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/ffmpeg/include
-    ../../BasicPlatForm/libs/FastDFS/include/fastcommon
-    ../../BasicPlatForm/libs/FastDFS/include/fastdfs
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder
-    ../../BasicPlatForm/basic/pipe
-    ../../BasicPlatForm/libs/jsoncpp/include
-    ../../BasicPlatForm/libs/glog/include
-    ../../BasicPlatForm/libs/libuuid/include
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder
+    ../../../BasicPlatForm/basic/pipe
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/libuuid/include
 
     /usr/include/x86_64-linux-gnu/qt5
     /usr/include/x86_64-linux-gnu/qt5/QtCore/
     /usr/include/x86_64-linux-gnu/qt5/QtSql/
     #glog
-    ../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/glog/include
 )
 
 link_directories(
     #glog
-    ../../BasicPlatForm/libs/glog/lib
-    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/ffmpeg/lib
-    ../../BasicPlatForm/libs/FastDFS/lib
-    ../../BasicPlatForm/libs/openssl/lib
-    ../../BasicPlatForm/libs/jsoncpp/lib
-    ../../BasicPlatForm/libs/libuuid/lib
+    ../../../BasicPlatForm/libs/glog/lib
+    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/FastDFS/lib
+    ../../../BasicPlatForm/libs/openssl/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../BasicPlatForm/libs/libuuid/lib
 )
 
 
diff --git a/QiaoJiaSystem/StructureApp/CMakeLists.txt b/QiaoJiaSystem/StructureApp/CMakeLists.txt
index 901e914..663a782 100644
--- a/QiaoJiaSystem/StructureApp/CMakeLists.txt
+++ b/QiaoJiaSystem/StructureApp/CMakeLists.txt
@@ -8,7 +8,7 @@
 
 SET(SOURCES
 
-#    HiredisTool.cpp
+    #    HiredisTool.cpp
     NewRecordVideoElement.cpp
     JudgmentRetrogradeTool.cpp
     PerimeterElement.cpp
@@ -28,15 +28,15 @@
     ../RecordVideo/rpc/RecordVideo.cpp
     ../RapidStructureApp/TriggerElement.cpp
 
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
-    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
-    ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
-    ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
-    ../../BasicPlatForm/basic/pipe/TimerElement.cpp
-    ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
-    ../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
-    ../../BasicPlatForm/basic/util/net_config/net_config.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
+    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
+    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
+    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
+    ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
+    ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
     )
 
 SET(LIBS
@@ -74,39 +74,39 @@
     ../FaceSearchServer/rpc
     ../RapidStructureApp/
 
-    ../../BasicPlatForm
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/ffmpeg/include
-    ../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
 
-    ../../BasicPlatForm/basic/util/net_config/
-    ../../BasicPlatForm/basic/util/fastdfs/
-    ../../BasicPlatForm/libs/FastDFS/include
-    ../../BasicPlatForm/libs/FastDFS/include/fastdfs
-    ../../BasicPlatForm/libs/FastDFS/include/fastcommon
+    ../../../BasicPlatForm/basic/util/net_config/
+    ../../../BasicPlatForm/basic/util/fastdfs/
+    ../../../BasicPlatForm/libs/FastDFS/include
+    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
 
-    ../../BasicPlatForm/basic/pipe/
-    ../../BasicPlatForm/libs/crul/include
-    ../../BasicPlatForm/basic/util/curl/
-    ../../BasicPlatForm/libs/libuuid/include
-    ../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/basic/pipe/
+    ../../../BasicPlatForm/libs/crul/include
+    ../../../BasicPlatForm/basic/util/curl/
+    ../../../BasicPlatForm/libs/libuuid/include
+    ../../../BasicPlatForm/libs/glog/include
     /usr/include/x86_64-linux-gnu/qt5
     /usr/include/x86_64-linux-gnu/qt5/QtCore
 )
 
 link_directories(
     /usr/local/cuda/lib64
-    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
-    ../../BasicPlatForm/libs/openssl/lib
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/ffmpeg/lib
-    ../../BasicPlatForm/libs/jsoncpp/lib
-    ../../BasicPlatForm/libs/FastDFS/lib
-    ../../BasicPlatForm/libs/libuuid/lib
+    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+    ../../../BasicPlatForm/libs/openssl/lib
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../BasicPlatForm/libs/FastDFS/lib
+    ../../../BasicPlatForm/libs/libuuid/lib
 
-    ../../BasicPlatForm/libs/glog/lib
-    ../../BasicPlatForm/libs/crul/lib
+    ../../../BasicPlatForm/libs/glog/lib
+    ../../../BasicPlatForm/libs/crul/lib
 )
 
 add_executable(${PROJECT_NAME}
@@ -114,14 +114,13 @@
     ${SOURCES}
     )
 
-add_executable(AppPipeControllerTest
-    AppPipeControllerTest.cpp
-    ${SOURCES})
-
 target_link_libraries(${PROJECT_NAME}
     ${LIBS}
     )
 
-target_link_libraries(AppPipeControllerTest
-    ${LIBS}
-    )
+#add_executable(AppPipeControllerTest
+#    AppPipeControllerTest.cpp
+#    ${SOURCES})
+#target_link_libraries(AppPipeControllerTest
+#    ${LIBS}
+#    )
diff --git a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
index 9654ae7..1d8f81c 100644
--- a/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
+++ b/QiaoJiaSystem/VideoAnalysFromHC/CMakeLists.txt
@@ -13,7 +13,7 @@
 SET(SOURCES
 
     #
-    ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
+    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp
 
     #浠诲姟璋冨害妯″潡    
     ../VideoServer/QiaoJia/DB/LDBTool.cpp
@@ -62,19 +62,18 @@
 
 
     #閫氱敤妯″潡
-    ../../BasicPlatForm/basic/io/io.cpp
-    ../../BasicPlatForm/basic/io/io.h
-    ../../BasicPlatForm/basic/pipe/TimerElement.cpp
-    ../../BasicPlatForm/basic/pipe/PipeElement.cpp
-    ../../BasicPlatForm/basic/pipe/PipeElement.h
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
-    ../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.h
+    ../../../BasicPlatForm/basic/io/io.cpp
+    ../../../BasicPlatForm/basic/io/io.h
+    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
+    ../../../BasicPlatForm/basic/pipe/PipeElement.cpp
+    ../../../BasicPlatForm/basic/pipe/PipeElement.h
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.h
     #todo fix bug
     #    ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
-    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
-    ../../BasicPlatForm/basic/util/BASE64/Base64.cpp
-    ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
-    ../../BasicPlatForm/basic/db/ES/es/ManagerEsDB.cpp
+    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp
+    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp
+    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp
 
     #绾跨▼姹�
     myThread.cpp
@@ -99,8 +98,7 @@
     RtspAnalysElement.cpp
 
 
-
-    ../../BasicPlatForm/basic/util/net_config/net_config.cpp
+    ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
 
     main.cpp
     DBManageClass.cpp DBManageClass.h
@@ -164,7 +162,7 @@
 include_directories(
 
     #glog
-    ../../BasicPlatForm/libs/glog/include
+    ../../../BasicPlatForm/libs/glog/include
     ./
     ../VideoServer
     ../RapidStructureApp
@@ -177,25 +175,25 @@
     ../FaceDetectServer/rpc
     ../FaceSearchServer/rpc
 
-    ../../BasicPlatForm/
+    ../../../BasicPlatForm/
 
-    ../../BasicPlatForm/basic/pipe/
-    ../../BasicPlatForm/basic/util/fastdfs
-    ../../BasicPlatForm/basic/util/curl/
+    ../../../BasicPlatForm/basic/pipe/
+    ../../../BasicPlatForm/basic/util/fastdfs
+    ../../../BasicPlatForm/basic/util/curl/
     #webServer
-    ../../BasicPlatForm/basic/http_server/
-    ../../BasicPlatForm/basic/util/net_config/
+    ../../../BasicPlatForm/basic/http_server/
+    ../../../BasicPlatForm/basic/util/net_config/
 
-    ../../BasicPlatForm/libs/FastDFS/include/fastdfs
-    ../../BasicPlatForm/libs/FastDFS/include/fastcommon
-    ../../BasicPlatForm/libs/opencv/include
-    ../../BasicPlatForm/libs/Ice-3.7.0/include
-    ../../BasicPlatForm/libs/ffmpeg/include
-    ../../BasicPlatForm/libs/jsoncpp/include
-    ../../BasicPlatForm/libs/crul/include
-    ../../BasicPlatForm/libs/libuuid/include
-    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
-    ../../BasicPlatForm/libs/libboost/include
+    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs
+    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon
+    ../../../BasicPlatForm/libs/opencv/include
+    ../../../BasicPlatForm/libs/Ice-3.7.0/include
+    ../../../BasicPlatForm/libs/ffmpeg/include
+    ../../../BasicPlatForm/libs/jsoncpp/include
+    ../../../BasicPlatForm/libs/crul/include
+    ../../../BasicPlatForm/libs/libuuid/include
+    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn
+    ../../../BasicPlatForm/libs/libboost/include
 
 
     /usr/include/x86_64-linux-gnu/qt5
@@ -205,18 +203,18 @@
 
 link_directories(
     #glog
-    ../../BasicPlatForm/libs/glog/lib
-    ../../BasicPlatForm/libs/Ice-3.7.0/lib64
-    ../../BasicPlatForm/libs/openssl/lib
-    ../../BasicPlatForm/libs/opencv/lib
-    ../../BasicPlatForm/libs/ffmpeg/lib
-    ../../BasicPlatForm/libs/jsoncpp/lib
-    ../../BasicPlatForm/libs/crul/lib
-    ../../BasicPlatForm/libs/libuuid/lib
-    ../../BasicPlatForm/libs/FastDFS/lib
-    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
-    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
-    ../../BasicPlatForm/libs/libboost/lib
+    ../../../BasicPlatForm/libs/glog/lib
+    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64
+    ../../../BasicPlatForm/libs/openssl/lib
+    ../../../BasicPlatForm/libs/opencv/lib
+    ../../../BasicPlatForm/libs/ffmpeg/lib
+    ../../../BasicPlatForm/libs/jsoncpp/lib
+    ../../../BasicPlatForm/libs/crul/lib
+    ../../../BasicPlatForm/libs/libuuid/lib
+    ../../../BasicPlatForm/libs/FastDFS/lib
+    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
+    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
+    ../../../BasicPlatForm/libs/libboost/lib
 )
 
 add_executable(${PROJECT_NAME}

--
Gitblit v1.8.0