From 9ab1dafa887c6976f20517bedc283c05dba422ac Mon Sep 17 00:00:00 2001
From: t_max <1172915550@qq.com>
Date: Mon, 19 Jun 2023 18:09:47 +0800
Subject: [PATCH] fix(taosAdapter): do not use upx compression on macOS system

---
 cmake/taosadapter_CMakeLists.txt.in |  2 +-
 tools/CMakeLists.txt                | 30 +++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/cmake/taosadapter_CMakeLists.txt.in b/cmake/taosadapter_CMakeLists.txt.in
index ef6ed4af1d..13826a1a74 100644
--- a/cmake/taosadapter_CMakeLists.txt.in
+++ b/cmake/taosadapter_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taosadapter
 ExternalProject_Add(taosadapter
         GIT_REPOSITORY https://github.com/taosdata/taosadapter.git
-        GIT_TAG 3.0
+        GIT_TAG main
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosadapter"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9e8d91b6b6..e882658408 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -136,7 +136,33 @@ ELSE ()
             COMMAND cmake -E echo "Copy taosadapter-debug.exe"
             COMMAND cmake -E copy taosadapter-debug.exe ${CMAKE_BINARY_DIR}/build/bin
             )
-    ELSE (TD_WINDOWS)
+    ELSEIF (TD_DARWIN)
+        MESSAGE("Building taosAdapter on MACOS")
+        INCLUDE(ExternalProject)
+        ExternalProject_Add(taosadapter
+                PREFIX        "taosadapter"
+                SOURCE_DIR    ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter
+                BUILD_ALWAYS         off
+                DEPENDS             taos
+                BUILD_IN_SOURCE     1
+                CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config"
+                PATCH_COMMAND
+                COMMAND     git clean -f -d
+                BUILD_COMMAND
+                # COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+                COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -ldflags "-s -w -X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+                COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../include/client CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib  go build -a -o taosadapter-debug -ldflags "-X github.com/taosdata/taosadapter/v3/version.Version=${taos_version} -X github.com/taosdata/taosadapter/v3/version.CommitID=${taosadapter_commit_sha1}"
+                INSTALL_COMMAND
+                COMMAND cmake -E echo "Copy taosadapter"
+                COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin
+                COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E echo "Copy taosadapter.toml"
+                COMMAND cmake -E copy ./example/config/taosadapter.toml ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E copy ./taosadapter.service ${CMAKE_BINARY_DIR}/test/cfg/
+                COMMAND cmake -E echo "Copy taosadapter-debug"
+                COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
+                )
+    ELSE ()
         MESSAGE("Building taosAdapter on non-Windows")
         INCLUDE(ExternalProject)
         ExternalProject_Add(taosadapter
@@ -164,5 +190,5 @@ ELSE ()
             COMMAND cmake -E echo "Copy taosadapter-debug"
             COMMAND cmake -E copy taosadapter-debug ${CMAKE_BINARY_DIR}/build/bin
             )
-    ENDIF (TD_WINDOWS)
+    ENDIF ()
 ENDIF ()
-- 
GitLab