From 16e015253b2c3f01981914f34743794e1d203e94 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 9 Aug 2023 10:10:25 +0800
Subject: [PATCH] s3/mxml: remove os external dependency

---
 contrib/CMakeLists.txt            | 31 ++++++++++++++++++++++++++++---
 contrib/test/cos/CMakeLists.txt   |  4 ++--
 source/dnode/vnode/CMakeLists.txt |  2 +-
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index df9519d00f..db4d359938 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -124,6 +124,9 @@ endif(${BUILD_WITH_SQLITE})
 
 # cos
 if(${BUILD_WITH_COS})
+    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build/)
+    set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/build)
+    cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     cat("${TD_SUPPORT_DIR}/cos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     add_definitions(-DUSE_COS)
 endif(${BUILD_WITH_COS})
@@ -157,6 +160,21 @@ if(${BUILD_GEOS})
     cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
 
+#    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-function")
+#    include(ExternalProject)
+#    ExternalProject_Add(mxml
+#        GIT_REPOSITORY https://github.com/michaelrsweet/mxml.git
+#	GIT_TAG release-2.10
+#        SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
+#        #BINARY_DIR ""
+#        BUILD_IN_SOURCE TRUE
+#        CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build
+#        BUILD_COMMAND make
+#        INSTALL_COMMAND make install
+#        TEST_COMMAND ""
+#    )
+
+
 # download dependencies
 configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
 execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
@@ -355,7 +373,10 @@ endif()
 
 # cos
 if(${BUILD_WITH_COS})
+  if(NOT ${TD_WINDOWS})
+    #ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
     option(ENABLE_TEST "Enable the tests" OFF)
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/build/include)
 
     set(CMAKE_BUILD_TYPE debug)
     set(ORIG_CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
@@ -363,11 +384,15 @@ if(${BUILD_WITH_COS})
 
     add_subdirectory(cos-c-sdk-v5 EXCLUDE_FROM_ALL)
     target_include_directories(
-	cos_c_sdk
-        PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cos-c-sdk-v5/cos_c_sdk>
-    )
+      cos_c_sdk
+      PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cos-c-sdk-v5/cos_c_sdk>
+      )
 
     set(CMAKE_PROJECT_NAME ${ORIG_CMAKE_PROJECT_NAME})
+
+  else()
+
+  endif(NOT ${TD_WINDOWS})
 endif(${BUILD_WITH_COS})
 
 # lucene
diff --git a/contrib/test/cos/CMakeLists.txt b/contrib/test/cos/CMakeLists.txt
index 77c57e5a65..3eb484c2c5 100644
--- a/contrib/test/cos/CMakeLists.txt
+++ b/contrib/test/cos/CMakeLists.txt
@@ -39,11 +39,11 @@ target_include_directories(
 
 find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
 find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
-find_library(MINIXML_LIBRARY mxml)
+#find_library(MINIXML_LIBRARY mxml)
 find_library(CURL_LIBRARY curl)
 
 target_link_libraries(cosTest cos_c_sdk)
 target_link_libraries(cosTest ${APR_UTIL_LIBRARY})
 target_link_libraries(cosTest ${APR_LIBRARY})
-target_link_libraries(cosTest ${MINIXML_LIBRARY})
+target_link_libraries(cosTest mxml)
 target_link_libraries(cosTest ${CURL_LIBRARY})
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index 0612f924f5..eea81ea3d2 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -137,7 +137,7 @@ endif()
 
 find_library(APR_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
 find_library(APR_UTIL_LIBRARY aprutil-1 PATHS /usr/local/apr/lib/)
-find_library(MINIXML_LIBRARY mxml)
+#find_library(MINIXML_LIBRARY mxml)
 find_library(CURL_LIBRARY curl)
 
 target_link_libraries(
-- 
GitLab