diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index f81aa75cd790feceeea00ba15a29e331adc697e5..f5291c6125ede8d1566a7b4c8add6f43b2a4f05b 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 eb2784824a917017cd95fcc8dc096cbecb8ba650..5502070819894480a0d7a7320d0f113cc545a0ce 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 f3eb07c143f3579b8ad1c4627b4b7b52508db26e..b2778b69d93be9c86bb948223967d755fed9bbbe 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 81d912fc00d9d543cbee9835ef6c791b1b67542f..59bcb6eaff349e8b20fa13995d1a7297f9185a50 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 4736c1ebed80d899b4b31d4dce395b7cc278761a..cc8bc78e33ac47a49b34e3914484e2feb0644616 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)