From 86dc34fe16e8afa0103c69baeda20f620b0474ea Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Sun, 29 Mar 2020 18:12:57 +0800
Subject: [PATCH] [TD-63] finx link errors

---
 CMakeLists.txt            | 14 --------------
 src/dnode/CMakeLists.txt  |  7 +++++++
 src/mnode/CMakeLists.txt  |  7 -------
 src/mnode/src/mgmtAcct.c  |  1 +
 src/mnode/src/mgmtDb.c    |  2 +-
 src/mnode/src/mgmtGrant.c |  1 +
 src/mnode/src/mgmtUser.c  |  2 +-
 src/util/src/version.c    |  6 +++---
 8 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ce6338700..7443f1a911 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-SET(CMAKE_C_STANDARD 11)
-SET(CMAKE_VERBOSE_MAKEFILE ON)
-
 SET(TD_CLUSTER FALSE)
 SET(TD_ACCOUNT FALSE)
 SET(TD_GRANT FALSE)
@@ -21,17 +18,6 @@ INCLUDE(cmake/env.inc)
 INCLUDE(cmake/define.inc)
 INCLUDE(cmake/install.inc)
 
-#set output directory
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/lib)
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/build/bin)
-SET(TD_TESTS_OUTPUT_DIR ${PROJECT_BINARY_DIR}/test)
-
-MESSAGE(STATUS "Operating system dependency directory: " ${TD_OS_DIR})
-MESSAGE(STATUS "Project source directory: " ${PROJECT_SOURCE_DIR})
-MESSAGE(STATUS "Project binary files output path: " ${PROJECT_BINARY_DIR})
-MESSAGE(STATUS "Project executable files output path: " ${EXECUTABLE_OUTPUT_PATH})
-MESSAGE(STATUS "Project library files output path: " ${LIBRARY_OUTPUT_PATH})
-
 ADD_SUBDIRECTORY(deps)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tests)
diff --git a/src/dnode/CMakeLists.txt b/src/dnode/CMakeLists.txt
index d85782b463..b23075e439 100644
--- a/src/dnode/CMakeLists.txt
+++ b/src/dnode/CMakeLists.txt
@@ -15,6 +15,13 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   ADD_EXECUTABLE(taosd ${SRC})
   TARGET_LINK_LIBRARIES(taosd mnode taos_static monitor http tsdb)
 
+  IF (TD_ACCOUNT)
+    TARGET_LINK_LIBRARIES(taosd account)
+  ENDIF ()
+  IF (TD_GRANT)
+    TARGET_LINK_LIBRARIES(taosd grant)
+  ENDIF ()
+
   #IF (TD_CLUSTER)
   #  TARGET_LINK_LIBRARIES(taosd dcluster)
   #ENDIF ()
diff --git a/src/mnode/CMakeLists.txt b/src/mnode/CMakeLists.txt
index 12f761645b..3d8e712edd 100644
--- a/src/mnode/CMakeLists.txt
+++ b/src/mnode/CMakeLists.txt
@@ -14,13 +14,6 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
 
   ADD_LIBRARY(mnode ${SRC})
   TARGET_LINK_LIBRARIES(mnode trpc tutil pthread)
-  
-  IF (TD_ACCOUNT)
-    TARGET_LINK_LIBRARIES(account)
-  ENDIF ()
-  IF (TD_GRANT)
-    TARGET_LINK_LIBRARIES(grant)
-  ENDIF ()
 ENDIF ()
 
 
diff --git a/src/mnode/src/mgmtAcct.c b/src/mnode/src/mgmtAcct.c
index a716a955da..e7a05928bb 100644
--- a/src/mnode/src/mgmtAcct.c
+++ b/src/mnode/src/mgmtAcct.c
@@ -16,6 +16,7 @@
 #define _DEFAULT_SOURCE
 #ifndef _ACCOUNT
 #include "os.h"
+#include "taoserror.h"
 #include "mnode.h"
 #include "mgmtAcct.h"
 
diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c
index 5af6087372..41e7a70276 100644
--- a/src/mnode/src/mgmtDb.c
+++ b/src/mnode/src/mgmtDb.c
@@ -35,7 +35,7 @@
 #include "mgmtUser.h"
 #include "mgmtVgroup.h"
 
-static void   *tsDbSdb = NULL;
+void *         tsDbSdb = NULL;
 static int32_t tsDbUpdateSize;
 
 static int32_t mgmtCreateDb(SAcctObj *pAcct, SCMCreateDbMsg *pCreate);
diff --git a/src/mnode/src/mgmtGrant.c b/src/mnode/src/mgmtGrant.c
index 1ccd9894c9..774f642456 100644
--- a/src/mnode/src/mgmtGrant.c
+++ b/src/mnode/src/mgmtGrant.c
@@ -16,6 +16,7 @@
 #define _DEFAULT_SOURCE
 #ifndef _GRANT
 #include "os.h"
+#include "taoserror.h"
 #include "tlog.h"
 #include "mgmtGrant.h"
 
diff --git a/src/mnode/src/mgmtUser.c b/src/mnode/src/mgmtUser.c
index 65abcfecbc..4ed28bd594 100644
--- a/src/mnode/src/mgmtUser.c
+++ b/src/mnode/src/mgmtUser.c
@@ -25,7 +25,7 @@
 #include "mgmtShell.h"
 #include "mgmtUser.h"
 
-static void   *tsUserSdb = NULL;
+void *         tsUserSdb = NULL;
 static int32_t tsUserUpdateSize = 0;
 
 static int32_t mgmtDropUser(SAcctObj *pAcct, char *name);
diff --git a/src/util/src/version.c b/src/util/src/version.c
index d1294801ee..b6e10d8b7e 100644
--- a/src/util/src/version.c
+++ b/src/util/src/version.c
@@ -1,7 +1,7 @@
-char version[64] = "1.6.5.4";
-char compatible_version[64] = "1.6.1.0";
+char version[64] = "2.0.0.0";
+char compatible_version[64] = "2.0.0.0";
 char gitinfo[128] = "3264067e97300c84caa61ac909d548c9ca56de6b";
 char gitinfoOfInternal[128] = "da88f4a2474737d1f9c76adcf0ff7fd0975e7342";
-char buildinfo[512] = "Built by root at 2020-02-05 14:38";
+char buildinfo[512] = "Built by root at 2020-04-01 14:38";
 
 void libtaos_1_6_5_4_Linux_x64() {};
-- 
GitLab