apr：makefile for apr & apr-util

cmake/apr-util_CMakeLists.txt.in

+# 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 ""
+)

cmake/apr_CMakeLists.txt.in

+# 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 ""
+)

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)

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
 )