From 7114ad63e5ac8846a11e221079031ee22bccc4f1 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 9 Aug 2023 10:54:17 +0800
Subject: [PATCH] =?UTF-8?q?apr=EF=BC=9Amakefile=20for=20apr=20&=20apr-util?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/apr-util_CMakeLists.txt.in  | 12 ++++++++++++
 cmake/apr_CMakeLists.txt.in       | 12 ++++++++++++
 contrib/test/cos/CMakeLists.txt   |  8 ++++----
 source/dnode/vnode/CMakeLists.txt |  8 ++++----
 4 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 cmake/apr-util_CMakeLists.txt.in
 create mode 100644 cmake/apr_CMakeLists.txt.in

diff --git a/cmake/apr-util_CMakeLists.txt.in b/cmake/apr-util_CMakeLists.txt.in
new file mode 100644
index 0000000000..8471a05db6
--- /dev/null
+++ b/cmake/apr-util_CMakeLists.txt.in
@@ -0,0 +1,12 @@
+# apr-util
+ExternalProject_Add(apr
+        GIT_REPOSITORY https://github.com/apache/apr-util.git
+	GIT_TAG 1.5.4
+        SOURCE_DIR "${TD_CONTRIB_DIR}/apr-util"
+        BINARY_DIR ""
+        #BUILD_IN_SOURCE TRUE
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+)
diff --git a/cmake/apr_CMakeLists.txt.in b/cmake/apr_CMakeLists.txt.in
new file mode 100644
index 0000000000..68b6f39c89
--- /dev/null
+++ b/cmake/apr_CMakeLists.txt.in
@@ -0,0 +1,12 @@
+# apr
+ExternalProject_Add(apr
+        GIT_REPOSITORY https://github.com/apache/apr.git
+	GIT_TAG 1.5.2
+        SOURCE_DIR "${TD_CONTRIB_DIR}/apr"
+        BINARY_DIR ""
+        #BUILD_IN_SOURCE TRUE
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+)
diff --git a/contrib/test/cos/CMakeLists.txt b/contrib/test/cos/CMakeLists.txt
index 38de8a25e8..2d2e101877 100644
--- a/contrib/test/cos/CMakeLists.txt
+++ b/contrib/test/cos/CMakeLists.txt
@@ -37,13 +37,13 @@ target_include_directories(
   PUBLIC "${TD_SOURCE_DIR}/contrib/cos-c-sdk-v5/cos_c_sdk"
   )
 
-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(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(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 apr})
+target_link_libraries(cosTest apr-util})
 target_link_libraries(cosTest mxml)
 target_link_libraries(cosTest curl)
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index 562207268c..cf7d205c00 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -135,8 +135,8 @@ else()
     endif()
 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(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(CURL_LIBRARY curl)
 
@@ -162,8 +162,8 @@ target_link_libraries(
 
     # s3
     cos_c_sdk
-    ${APR_UTIL_LIBRARY}
-    ${APR_LIBRARY}
+    apr
+    apr-util
     mxml
     curl
 )