From 241f1732d78f1503bce08b57280d2b8dde5f507b Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 5 Aug 2020 14:24:02 +0800
Subject: [PATCH] TD-1057

---
 deps/CMakeLists.txt             |  2 +-
 deps/zlib-1.2.11/CMakeLists.txt |  4 ++--
 src/util/CMakeLists.txt         |  2 +-
 tests/examples/c/CMakeLists.txt | 18 +++++-------------
 tests/test/c/CMakeLists.txt     |  2 +-
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index f81aa75cd7..f5291c6125 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -10,6 +10,6 @@ ADD_SUBDIRECTORY(cJson)
 ADD_SUBDIRECTORY(wepoll)
 #ADD_SUBDIRECTORY(MsvcLibX)
 
-IF (NOT TD_WINDOWS)
+IF (TD_LINUX)
   ADD_SUBDIRECTORY(MQTT-C)
 ENDIF ()
\ No newline at end of file
diff --git a/deps/zlib-1.2.11/CMakeLists.txt b/deps/zlib-1.2.11/CMakeLists.txt
index eb2784824a..5502070819 100644
--- a/deps/zlib-1.2.11/CMakeLists.txt
+++ b/deps/zlib-1.2.11/CMakeLists.txt
@@ -1,8 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_LINUX_64 OR TD_WINDOWS)
+IF (TD_LINUX)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
   ADD_LIBRARY(z ${SRC})
-ENDIF ()
+ENDIF ()
\ No newline at end of file
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index f3eb07c143..b2778b69d9 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -24,7 +24,7 @@ IF (TD_LINUX)
   ENDIF ()
 
 ELSEIF (TD_WINDOWS)
-  TARGET_LINK_LIBRARIES(tutil iconv regex pthread osdetail winmm IPHLPAPI ws2_32 lz4)
+  TARGET_LINK_LIBRARIES(tutil iconv regex pthread osdetail winmm IPHLPAPI ws2_32 lz4 wepoll)
 ELSEIF(TD_DARWIN)
   TARGET_LINK_LIBRARIES(tutil iconv pthread osdetail lz4)
 ENDIF()
diff --git a/tests/examples/c/CMakeLists.txt b/tests/examples/c/CMakeLists.txt
index 81d912fc00..59bcb6eaff 100644
--- a/tests/examples/c/CMakeLists.txt
+++ b/tests/examples/c/CMakeLists.txt
@@ -1,16 +1,8 @@
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
-  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
+IF (TD_LINUX)
+  INCLUDE_DIRECTORIES(. ${TD_COMMUNITY_DIR}/src/inc ${TD_COMMUNITY_DIR}/src/client/inc  ${TD_COMMUNITY_DIR}/inc)
+  AUX_SOURCE_DIRECTORY(. SRC)
+  ADD_EXECUTABLE(demo demo.c)
+  TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread )
 ENDIF ()
-
-INCLUDE_DIRECTORIES(. ${TD_COMMUNITY_DIR}/src/inc ${TD_COMMUNITY_DIR}/src/client/inc  ${TD_COMMUNITY_DIR}/inc)
-AUX_SOURCE_DIRECTORY(. SRC)
-ADD_EXECUTABLE(demo demo.c)
-TARGET_LINK_LIBRARIES(demo taos_static trpc tutil pthread )
-
-
-
-
-
-
diff --git a/tests/test/c/CMakeLists.txt b/tests/test/c/CMakeLists.txt
index 4736c1ebed..cc8bc78e33 100644
--- a/tests/test/c/CMakeLists.txt
+++ b/tests/test/c/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/os/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
 
-IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+IF (TD_LINUX)
   #add_executable(insertPerTable insertPerTable.c)
   #target_link_libraries(insertPerTable taos_static pthread)
 
-- 
GitLab