提交 511a71f4 编写于 作者: Z zhiru

Merge branch 'mysql-0.3.0' of http://192.168.1.105:6060/zhiru.zhu/vecwise_engine into mysql-0.3.0


Former-commit-id: 521930efe6579cb437f41abc833b7194ecd58776
...@@ -271,7 +271,7 @@ endif() ...@@ -271,7 +271,7 @@ endif()
if(DEFINED ENV{MILVUS_MYSQLPP_URL}) if(DEFINED ENV{MILVUS_MYSQLPP_URL})
set(MYSQLPP_SOURCE_URL "$ENV{MILVUS_MYSQLPP_URL}") set(MYSQLPP_SOURCE_URL "$ENV{MILVUS_MYSQLPP_URL}")
else() else()
set(MYSQLPP_SOURCE_URL "https://tangentsoft.com/mysqlpp/releases/mysql++-${MYSQLPP_VERSION}.tar.gz") set(MYSQLPP_SOURCE_URL "https://github.com/youny626/mysqlpp.git")
endif() endif()
if (DEFINED ENV{MILVUS_OPENBLAS_URL}) if (DEFINED ENV{MILVUS_OPENBLAS_URL})
...@@ -1095,15 +1095,24 @@ macro(build_mysqlpp) ...@@ -1095,15 +1095,24 @@ macro(build_mysqlpp)
"LDFLAGS=-pthread") "LDFLAGS=-pthread")
externalproject_add(mysqlpp_ep externalproject_add(mysqlpp_ep
URL # URL
# ${MYSQLPP_SOURCE_URL}
GIT_REPOSITORY
${MYSQLPP_SOURCE_URL} ${MYSQLPP_SOURCE_URL}
GIT_TAG
${MYSQLPP_VERSION}
GIT_SHALLOW
TRUE
${EP_LOG_OPTIONS} ${EP_LOG_OPTIONS}
CONFIGURE_COMMAND CONFIGURE_COMMAND
"./bootstrap"
COMMAND
"./configure" "./configure"
${MYSQLPP_CONFIGURE_ARGS} ${MYSQLPP_CONFIGURE_ARGS}
BUILD_COMMAND BUILD_COMMAND
${MAKE} ${MAKE_BUILD_ARGS} ${MAKE} ${MAKE_BUILD_ARGS}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE
1
BUILD_BYPRODUCTS BUILD_BYPRODUCTS
${MYSQLPP_SHARED_LIB}) ${MYSQLPP_SHARED_LIB})
......
...@@ -7,7 +7,7 @@ GTEST_VERSION=1.8.1 ...@@ -7,7 +7,7 @@ GTEST_VERSION=1.8.1
JSONCONS_VERSION=0.126.0 JSONCONS_VERSION=0.126.0
LAPACK_VERSION=v3.8.0 LAPACK_VERSION=v3.8.0
LZ4_VERSION=v1.9.1 LZ4_VERSION=v1.9.1
MYSQLPP_VERSION=3.2.4 MYSQLPP_VERSION=zilliz
OPENBLAS_VERSION=v0.3.6 OPENBLAS_VERSION=v0.3.6
PROMETHEUS_VERSION=v0.7.0 PROMETHEUS_VERSION=v0.7.0
ROCKSDB_VERSION=v6.0.2 ROCKSDB_VERSION=v6.0.2
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册