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

cos: use ~/local as prefix for building

This commit is contained in:
Minglei Jin 2023-08-09 16:53:19 +08:00
parent 93ce558abf
commit bc64d5f769
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +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 --with-apr=/usr/local/apr
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/ --with-apr=$ENV{HOME}/local
#CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
BUILD_COMMAND make
INSTALL_COMMAND make install
TEST_COMMAND ""

4
cmake/apr_CMakeLists.txt.in
View File

@ -9,8 +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
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/
#CONFIGURE_COMMAND ./configure
BUILD_COMMAND make
INSTALL_COMMAND make install
TEST_COMMAND ""

4
cmake/curl_CMakeLists.txt.in
View File

@ -8,8 +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 --without-ssl
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local --without-ssl
#CONFIGURE_COMMAND ./configure --without-ssl
BUILD_COMMAND make
INSTALL_COMMAND make install
TEST_COMMAND ""

4
cmake/mxml_CMakeLists.txt.in
View File

@ -6,8 +6,8 @@ ExternalProject_Add(mxml
#BINARY_DIR ""
BUILD_IN_SOURCE TRUE
UPDATE_COMMAND ""
#CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build/
CONFIGURE_COMMAND ./configure
CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local
#CONFIGURE_COMMAND ./configure
BUILD_COMMAND make
INSTALL_COMMAND make install
TEST_COMMAND ""

4
contrib/CMakeLists.txt
View File

@ -124,7 +124,7 @@ endif(${BUILD_WITH_SQLITE})
# cos
if(${BUILD_WITH_COS})
#file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/build/)
file(MAKE_DIRECTORY $ENV{HOME}/local/)
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 $ENV{HOME}/local)
#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)

1
tests/parallel_test/container_build.sh
View File

@ -88,6 +88,7 @@ docker run \
-v /root/.cargo/git:/root/.cargo/git \
-v /root/go/pkg/mod:/root/go/pkg/mod \
-v /root/.cache/go-build:/root/.cache/go-build \
-v /root/local:/root/local \
-v ${REP_REAL_PATH}/enterprise/src/plugins/taosx/target:${REP_DIR}/enterprise/src/plugins/taosx/target \
-v ${REP_REAL_PATH}/community/tools/taosws-rs/target:${REP_DIR}/community/tools/taosws-rs/target \
-v ${REP_REAL_PATH}/community/contrib/cJson/:${REP_DIR}/community/contrib/cJson \