From 5ede107b9458a9c9e0d91520cc1241d8fc6a3a0f Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 7 Aug 2020 15:54:51 +0800
Subject: [PATCH] minor changes for cmake

---
 cmake/define.inc                   | 34 +++++++++++++++---------------
 src/kit/taosnetwork/CMakeLists.txt |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cmake/define.inc b/cmake/define.inc
index 5c005b0cb5..f12806d6bd 100755
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -29,6 +29,23 @@ IF (TD_RANDOM_NETWORK_FAIL)
   ADD_DEFINITIONS(-DTAOS_RANDOM_NETWORK_FAIL)
 ENDIF ()
 
+IF (TD_LINUX_64)
+  ADD_DEFINITIONS(-D_M_X64)
+  ADD_DEFINITIONS(-D_TD_LINUX_64)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  
+  FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/)
+  IF (ICONV_INCLUDE_EXIST)
+    ADD_DEFINITIONS(-DUSE_LIBICONV)
+  ENDIF ()
+ENDIF ()
+
+IF (TD_LINUX_32)
+  ADD_DEFINITIONS(-D_TD_LINUX_32)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
+  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -munaligned-access -fpack-struct=8 -latomic -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+ENDIF ()
+
 IF (TD_ARM_64)
   ADD_DEFINITIONS(-D_TD_ARM_64_)
   SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
@@ -49,23 +66,6 @@ IF (TD_MIPS_32)
   SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
-IF (TD_LINUX_64)
-  ADD_DEFINITIONS(-D_M_X64)
-  ADD_DEFINITIONS(-D_TD_LINUX_64)
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
-  
-  FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/)
-  IF (ICONV_INCLUDE_EXIST)
-    ADD_DEFINITIONS(-DUSE_LIBICONV)
-  ENDIF ()
-ENDIF ()
-
-IF (TD_LINUX_32)
-  ADD_DEFINITIONS(-D_TD_LINUX_32)
-  ADD_DEFINITIONS(-DUSE_LIBICONV)
-  SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -munaligned-access -fpack-struct=8 -latomic -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
-ENDIF ()
-
 IF (TD_APLHINE)
   SET(COMMON_FLAGS "${COMMON_FLAGS} -largp")
   link_libraries(/usr/lib/libargp.a)
diff --git a/src/kit/taosnetwork/CMakeLists.txt b/src/kit/taosnetwork/CMakeLists.txt
index a7412b196d..9d2a5ba3f8 100644
--- a/src/kit/taosnetwork/CMakeLists.txt
+++ b/src/kit/taosnetwork/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+IF (TD_LINUX)
   AUX_SOURCE_DIRECTORY(. SRC)
   ADD_EXECUTABLE(taosClient client.c)
   ADD_EXECUTABLE(taosServer server.c)
-- 
GitLab