Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-14 2b1a3988c9fd35c39e3e43d0382d65a13c45efee

 QiaoJiaSystem/DataManagerServer/CMakeLists.txt

@@ -80,6 +80,7 @@
    ../../../BasicPlatForm/basic/db/sqlite/
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/libs/mysqlpp/lib
    ../../../BasicPlatForm/libs/mysql/lib
)

add_executable(DataWebServer
@@ -110,7 +111,7 @@
    ../LocalDBTool/SqliteFaceEncap.cpp
    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.cpp
    ../../../BasicPlatForm/basic/db/sqlite/sqliteEncapsulation.h
    )
        vss/dao/BaseDao.cpp)

target_link_libraries(DataWebServer
    glog
@@ -154,7 +155,8 @@
    HCCore
    hcnetsdk
    pthread
#    mysqlpp
    mysqlpp
        mysqlclient
    )

#add_executable(Apptest