From 5d0edcd17b16bc557087a7f148d9f6b2d69d39d4 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 9 Aug 2023 15:41:23 +0800
Subject: [PATCH] cos: use /usr/local as prefix instead of debug/build

---
 cmake/apr-util_CMakeLists.txt.in | 3 ++-
 cmake/apr_CMakeLists.txt.in      | 3 ++-
 cmake/curl_CMakeLists.txt.in     | 3 ++-
 cmake/mxml_CMakeLists.txt.in     | 3 ++-
 contrib/CMakeLists.txt           | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cmake/apr-util_CMakeLists.txt.in b/cmake/apr-util_CMakeLists.txt.in
index ee30787cb6..fc4f92858c 100644
--- a/cmake/apr-util_CMakeLists.txt.in
+++ b/cmake/apr-util_CMakeLists.txt.in
@@ -10,7 +10,8 @@ ExternalProject_Add(aprutil-1
         #BINARY_DIR ""
         BUILD_IN_SOURCE TRUE
         UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --with-apr=${CMAKE_BINARY_DIR}/build
+        #CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --with-apr=${CMAKE_BINARY_DIR}/build
+        CONFIGURE_COMMAND ./configure --with-apr=/usr/local/
         BUILD_COMMAND make
         INSTALL_COMMAND make install
         TEST_COMMAND ""
diff --git a/cmake/apr_CMakeLists.txt.in b/cmake/apr_CMakeLists.txt.in
index fa124de62c..57e2014c31 100644
--- a/cmake/apr_CMakeLists.txt.in
+++ b/cmake/apr_CMakeLists.txt.in
@@ -9,7 +9,8 @@ ExternalProject_Add(apr-1
         SOURCE_DIR "${TD_CONTRIB_DIR}/apr"
         BUILD_IN_SOURCE TRUE
         UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
+        #CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
+        CONFIGURE_COMMAND ./configure
         BUILD_COMMAND make
         INSTALL_COMMAND make install
         TEST_COMMAND ""
diff --git a/cmake/curl_CMakeLists.txt.in b/cmake/curl_CMakeLists.txt.in
index 47c4fd72a1..fcd16a0518 100644
--- a/cmake/curl_CMakeLists.txt.in
+++ b/cmake/curl_CMakeLists.txt.in
@@ -8,7 +8,8 @@ ExternalProject_Add(curl
         SOURCE_DIR "${TD_CONTRIB_DIR}/curl"
         BUILD_IN_SOURCE TRUE
         UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --without-ssl
+        #CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/ --without-ssl
+        CONFIGURE_COMMAND ./configure --without-ssl
         BUILD_COMMAND make
         INSTALL_COMMAND make install
         TEST_COMMAND ""
diff --git a/cmake/mxml_CMakeLists.txt.in b/cmake/mxml_CMakeLists.txt.in
index 12c9ea7d89..cdd3e5b301 100644
--- a/cmake/mxml_CMakeLists.txt.in
+++ b/cmake/mxml_CMakeLists.txt.in
@@ -6,7 +6,8 @@ ExternalProject_Add(mxml
         #BINARY_DIR ""
         BUILD_IN_SOURCE TRUE
         UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
+        #CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
+        CONFIGURE_COMMAND ./configure
         BUILD_COMMAND make
         INSTALL_COMMAND make install
         TEST_COMMAND ""
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 058b2cf042..507928cbe9 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -124,7 +124,7 @@ endif(${BUILD_WITH_SQLITE})
 
 # cos
 if(${BUILD_WITH_COS})
-    file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build/)
+    #file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build/)
     cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
     cat("${TD_SUPPORT_DIR}/apr-util_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
@@ -376,7 +376,7 @@ endif()
 # cos
 if(${BUILD_WITH_COS})
   if(NOT ${TD_WINDOWS})
-    set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/build)
+    #set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/build)
     #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)