xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

apr：makefile for apr & apr-util

This commit is contained in:
Minglei Jin 2023-08-09 10:54:17 +08:00
parent 4d1155a5cf
commit 7114ad63e5
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/apr-util_CMakeLists.txt.in Normal file
View File

@ -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 ""
)

12
cmake/apr_CMakeLists.txt.in Normal file
View File

@ -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 ""
)

8
contrib/test/cos/CMakeLists.txt
View File

@ -37,13 +37,13 @@ target_include_directories(
PUBLIC "${TD_SOURCE_DIR}/contrib/cos-c-sdk-v5/cos_c_sdk" 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_LIBRARY apr-1 PATHS /usr/local/apr/lib/)
find_library(APR_UTIL_LIBRARY aprutil-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) #find_library(CURL_LIBRARY curl)
target_link_libraries(cosTest cos_c_sdk) target_link_libraries(cosTest cos_c_sdk)
target_link_libraries(cosTest ${APR_UTIL_LIBRARY}) target_link_libraries(cosTest apr})
target_link_libraries(cosTest ${APR_LIBRARY}) target_link_libraries(cosTest apr-util})
target_link_libraries(cosTest mxml) target_link_libraries(cosTest mxml)
target_link_libraries(cosTest curl) target_link_libraries(cosTest curl)

8
source/dnode/vnode/CMakeLists.txt
View File

@ -135,8 +135,8 @@ else()
endif() endif()
endif() endif()
find_library(APR_LIBRARY apr-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(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) #find_library(CURL_LIBRARY curl)
@ -162,8 +162,8 @@ target_link_libraries(
# s3 # s3
cos_c_sdk cos_c_sdk
${APR_UTIL_LIBRARY} apr
${APR_LIBRARY} apr-util
mxml mxml
curl curl
) )