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

apr: make apr, apu, curl build always

This commit is contained in:
Minglei Jin 2023-08-09 17:53:25 +08:00
parent 4911b6c855
commit a5ccc3e8aa
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/apr-util_CMakeLists.txt.in
View File

@ -9,7 +9,8 @@ ExternalProject_Add(aprutil-1
SOURCE_DIR "${TD_CONTRIB_DIR}/apr-util" SOURCE_DIR "${TD_CONTRIB_DIR}/apr-util"
#BINARY_DIR "" #BINARY_DIR ""
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
UPDATE_COMMAND "" BUILD_ALWAYS 1
#UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/ --with-apr=$ENV{HOME}/local CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/ --with-apr=$ENV{HOME}/local
#CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr #CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
BUILD_COMMAND make BUILD_COMMAND make

4
cmake/apr_CMakeLists.txt.in
View File

@ -8,7 +8,9 @@ ExternalProject_Add(apr-1
#GIT_TAG 1.5.2 #GIT_TAG 1.5.2
SOURCE_DIR "${TD_CONTRIB_DIR}/apr" SOURCE_DIR "${TD_CONTRIB_DIR}/apr"
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
UPDATE_COMMAND "" UPDATE_DISCONNECTED TRUE
BUILD_ALWAYS 1
#UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/ CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/
#CONFIGURE_COMMAND ./configure #CONFIGURE_COMMAND ./configure
BUILD_COMMAND make BUILD_COMMAND make

3
cmake/curl_CMakeLists.txt.in
View File

@ -7,7 +7,8 @@ ExternalProject_Add(curl
#GIT_TAG curl-7_88_1 #GIT_TAG curl-7_88_1
SOURCE_DIR "${TD_CONTRIB_DIR}/curl" SOURCE_DIR "${TD_CONTRIB_DIR}/curl"
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
UPDATE_COMMAND "" BUILD_ALWAYS 1
#UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local --without-ssl CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local --without-ssl
#CONFIGURE_COMMAND ./configure --without-ssl #CONFIGURE_COMMAND ./configure --without-ssl
BUILD_COMMAND make BUILD_COMMAND make

2
cmake/mxml_CMakeLists.txt.in
View File

@ -5,7 +5,7 @@ ExternalProject_Add(mxml
SOURCE_DIR "${TD_CONTRIB_DIR}/mxml" SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
#BINARY_DIR "" #BINARY_DIR ""
BUILD_IN_SOURCE TRUE BUILD_IN_SOURCE TRUE
UPDATE_COMMAND "" #UPDATE_COMMAND ""
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local
#CONFIGURE_COMMAND ./configure #CONFIGURE_COMMAND ./configure
BUILD_COMMAND make BUILD_COMMAND make

15
contrib/CMakeLists.txt
View File

@ -162,21 +162,6 @@ if(${BUILD_GEOS})
cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE}) cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
endif() endif()
# SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-function")
# include(ExternalProject)
# ExternalProject_Add(mxml
# GIT_REPOSITORY https://github.com/michaelrsweet/mxml.git
# GIT_TAG release-2.10
# SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
# #BINARY_DIR ""
# BUILD_IN_SOURCE TRUE
# CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build
# BUILD_COMMAND make
# INSTALL_COMMAND make install
# TEST_COMMAND ""
# )
# download dependencies # download dependencies
configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt") configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .