From 45ea0c5d8e24ef0e62e984249cffa38b9b36fbdc Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 4 Aug 2020 11:24:17 +0800
Subject: [PATCH] TD-1037 minor changes

---
 deps/MQTT-C/CMakeLists.txt    |  8 ++++----
 deps/cJson/CMakeLists.txt     |  6 +++---
 deps/lz4/CMakeLists.txt       | 13 ++++++++-----
 src/tsdb/tests/CMakeLists.txt |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/deps/MQTT-C/CMakeLists.txt b/deps/MQTT-C/CMakeLists.txt
index cb288a4193..ea5d4238d5 100644
--- a/deps/MQTT-C/CMakeLists.txt
+++ b/deps/MQTT-C/CMakeLists.txt
@@ -10,11 +10,11 @@ option(MQTT_C_TESTS "Build MQTT-C tests?" OFF)
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 # MQTT-C library
-add_library(mqttc STATIC 
+ADD_LIBRARY(mqttc STATIC 
     src/mqtt_pal.c
     src/mqtt.c
 )
-target_include_directories(mqttc PUBLIC include)
+TARGET_INCLUDE_DIRECTORIES(mqttc PUBLIC include)
 target_link_libraries(mqttc PUBLIC 
     $<$<C_COMPILER_ID:MSVS>:ws2_32>
 )
@@ -30,7 +30,7 @@ endif()
 # Configure with mbed TLS support
 if(MQTT_C_MbedTLS_SUPPORT)
     find_package(MbedTLS REQUIRED)
-    target_include_directories(mqttc PUBLIC ${MBEDTLS_INCLUDE_DIRS})
+    TARGET_INCLUDE_DIRECTORIES(mqttc PUBLIC ${MBEDTLS_INCLUDE_DIRS})
     target_link_libraries(mqttc INTERFACE ${MBEDTLS_LIBRARY})
     target_compile_definitions(mqttc PUBLIC MQTT_USE_MBEDTLS)
 endif()
@@ -70,7 +70,7 @@ if(MQTT_C_TESTS)
 
     add_executable(tests tests.c)
     target_link_libraries(tests ${CMOCKA_LIBRARY} mqttc)
-    target_include_directories(tests PRIVATE ${CMOCKA_INCLUDE_DIR})
+    TARGET_INCLUDE_DIRECTORIES(tests PRIVATE ${CMOCKA_INCLUDE_DIR})
 endif()
 
 # Install includes and library
diff --git a/deps/cJson/CMakeLists.txt b/deps/cJson/CMakeLists.txt
index 43b31589b3..2fe1975065 100644
--- a/deps/cJson/CMakeLists.txt
+++ b/deps/cJson/CMakeLists.txt
@@ -1,4 +1,4 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
 
-add_library(cJson ${SOURCE_LIST})
-target_include_directories(cJson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
\ No newline at end of file
+ADD_LIBRARY(cJson ${SOURCE_LIST})
+TARGET_INCLUDE_DIRECTORIES(cJson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
\ No newline at end of file
diff --git a/deps/lz4/CMakeLists.txt b/deps/lz4/CMakeLists.txt
index d371974121..c3762ffe73 100644
--- a/deps/lz4/CMakeLists.txt
+++ b/deps/lz4/CMakeLists.txt
@@ -1,6 +1,9 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src SOURCE_LIST)
 
-add_library(lz4 ${SOURCE_LIST})
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
-target_include_directories(lz4 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
\ No newline at end of file
+IF (TD_WINDOWS)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /WX-")
+  SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /WX-")
+ENDIF()
+
+ADD_LIBRARY(lz4 ${SOURCE_LIST})
+TARGET_INCLUDE_DIRECTORIES(lz4 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/inc)
\ No newline at end of file
diff --git a/src/tsdb/tests/CMakeLists.txt b/src/tsdb/tests/CMakeLists.txt
index b330109340..a3477aef95 100644
--- a/src/tsdb/tests/CMakeLists.txt
+++ b/src/tsdb/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 
 add_executable(tsdbTests ${SOURCE_LIST})
 target_link_libraries(tsdbTests gtest gtest_main pthread common tsdb tutil trpc)
-- 
GitLab