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

xuxiuxi

2019-03-08 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612

 QiaoJiaSystem/LocalDBTool/CMakeLists.txt

@@ -13,16 +13,16 @@
include_directories(
    ./

    ../../BasicPlatForm
    ../../../BasicPlatForm

    ../../BasicPlatForm/basic/util/app
    ../../../BasicPlatForm/basic/util/app

    ../../BasicPlatForm/basic/db/sqlite/
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/basic/db/sqlite/
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000

    ../../BasicPlatForm/libs/libuuid/include
    ../../BasicPlatForm/libs/glog/include
    ../../BasicPlatForm/libs/jsoncpp/include
    ../../../BasicPlatForm/libs/libuuid/include
    ../../../BasicPlatForm/libs/glog/include
    ../../../BasicPlatForm/libs/jsoncpp/include

    /usr/include/x86_64-linux-gnu/qt5
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
@@ -31,10 +31,10 @@
)

link_directories(
    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../BasicPlatForm/libs/libuuid/lib
    ../../BasicPlatForm/libs/glog/lib
    ../../BasicPlatForm/libs/jsoncpp/lib
    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000
    ../../../BasicPlatForm/libs/libuuid/lib
    ../../../BasicPlatForm/libs/glog/lib
    ../../../BasicPlatForm/libs/jsoncpp/lib

)