apr: fix apr & apr-util project names

cmake/apr-util_CMakeLists.txt.in

 # apr-util
-ExternalProject_Add(apr
+ExternalProject_Add(aprutil-1
         GIT_REPOSITORY https://github.com/apache/apr-util.git
 	GIT_TAG 1.5.4
         SOURCE_DIR "${TD_CONTRIB_DIR}/apr-util"

cmake/apr_CMakeLists.txt.in

 # apr
-ExternalProject_Add(apr
+ExternalProject_Add(apr-1
         GIT_REPOSITORY https://github.com/apache/apr.git
 	GIT_TAG 1.5.2
         SOURCE_DIR "${TD_CONTRIB_DIR}/apr"

contrib/test/cos/CMakeLists.txt

@@ -43,7 +43,7 @@ target_include_directories(
 #find_library(CURL_LIBRARY curl)
 
 target_link_libraries(cosTest cos_c_sdk)
-target_link_libraries(cosTest apr})
-target_link_libraries(cosTest apr-util})
+target_link_libraries(cosTest apr-1})
+target_link_libraries(cosTest aprutil-1})
 target_link_libraries(cosTest mxml)
 target_link_libraries(cosTest curl)

source/dnode/vnode/CMakeLists.txt

@@ -162,8 +162,8 @@ target_link_libraries(
 
     # s3
     cos_c_sdk
-    apr
-    apr-util
+    apr-1
+    aprutil-1
     mxml
     curl
 )