代码格式化及部分bug修改

pansen

2019-03-05 ed223aee5fe5f3b222488549597976f34c679c3d

 QiaoJiaSystem/DataManagerServer/CMakeLists.txt

@@ -36,7 +36,7 @@
    ../../../BasicPlatForm/libs/libuuid/include
    ../../../BasicPlatForm/libs/uniview/include

    ../../../Erlang/syncDBTool
    ../../syncDBTool

    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn

@@ -49,33 +49,37 @@

    #glog
    ../../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/mysqlpp/include
    ../../../BasicPlatForm/libs/mysql/include/mysql/
    ../../../BasicPlatForm/basic/util/app/

)

link_directories(
    #glog
    ../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/glog/lib

    /usr/lib/erlang/lib/erl_interface-3.8.2/lib/
    /usr/local/cuda/lib64

    ../../BasicPlatForm/libs/opencv/lib
    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
    ../../BasicPlatForm/libs/crul/lib
    ../../BasicPlatForm/libs/FastDFS/lib
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../BasicPlatForm/libs/ffmpeg/lib
    ../../BasicPlatForm/libs/libuuid/lib
    ../../../BasicPlatForm/libs/opencv/lib
    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu
    ../../../BasicPlatForm/libs/crul/lib
    ../../../BasicPlatForm/libs/FastDFS/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/libs/ffmpeg/lib
    ../../../BasicPlatForm/libs/libuuid/lib

    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
    ../../BasicPlatForm/libs/uniview/lib
    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/
    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/
    ../../../BasicPlatForm/libs/uniview/lib

    ../../BasicPlatForm/libs/libboost/lib
    ../../../BasicPlatForm/libs/libboost/lib


    ../../BasicPlatForm/basic/db/sqlite/
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/basic/db/sqlite/
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/libs/mysqlpp/lib
)

add_executable(DataWebServer
@@ -96,6 +100,8 @@
    ../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp



    ../../syncDBTool/ErlangDbTool.cpp
@@ -148,6 +154,7 @@
    HCCore
    hcnetsdk
    pthread
    mysqlpp
    )

#add_executable(Apptest