From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/LocalDBTool/CMakeLists.txt | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/LocalDBTool/CMakeLists.txt b/QiaoJiaSystem/LocalDBTool/CMakeLists.txt
index e2c9cef..1446817 100644
--- a/QiaoJiaSystem/LocalDBTool/CMakeLists.txt
+++ b/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
)
--
Gitblit v1.8.0