rm multiple url for yaml-cpp (#3260)

Signed-off-by: yangxuan <xuan.yang@zilliz.com>

Co-authored-by: yangxuan <xuan.yang@zilliz.com>
This commit is contained in:
XuanYang-cn 2020-08-15 14:47:34 +08:00 committed by GitHub
parent ee4f949728
commit 8eff438a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 23 deletions

View File

@ -34,23 +34,11 @@ find_package( Threads REQUIRED )
# ****************************** Thirdparty googletest ***************************************
if ( MILVUS_BUILD_TESTS )
if ( DEFINED ENV{MILVUS_GTEST_URL} )
set( GTEST_SOURCE_URL "$ENV{MILVUS_GTEST_URL}" )
else()
set( GTEST_SOURCE_URL
"https://gitee.com/quicksilver/googletest/repository/archive/release-${GTEST_VERSION}.zip" )
endif()
add_subdirectory( gtest )
endif()
# ****************************** Thirdparty grpc ***************************************
if ( MILVUS_WITH_GRPC )
if ( DEFINED ENV{MILVUS_GRPC_URL} )
set( GRPC_SOURCE_URL "$ENV{MILVUS_GRPC_URL}" )
else()
set( GRPC_SOURCE_URL
"https://github.com/milvus-io/grpc-milvus/archive/${GRPC_VERSION}.zip" )
endif()
add_subdirectory( grpc )
endif ()

View File

@ -11,6 +11,13 @@
# or implied. See the License for the specific language governing permissions and limitations under the License.
#-------------------------------------------------------------------------------
if ( DEFINED ENV{MILVUS_GRPC_URL} )
set( GRPC_SOURCE_URL "$ENV{MILVUS_GRPC_URL}" )
else()
set( GRPC_SOURCE_URL
"https://github.com/milvus-io/grpc-milvus/archive/${GRPC_VERSION}.zip" )
endif()
message( STATUS "Building GRPC-${GRPC_VERSION} from source" )
FetchContent_Declare(
grpc

View File

@ -11,29 +11,34 @@
# or implied. See the License for the specific language governing permissions and limitations under the License.
#-------------------------------------------------------------------------------
# *********************************** FetchContent ***********************************
# Pros: Simple, done at configure time, can be used immediately
# ************************************************************************************
if ( DEFINED ENV{MILVUS_GTEST_URL} )
set( GTEST_SOURCE_URL "$ENV{MILVUS_GTEST_URL}" )
else()
set( GTEST_SOURCE_URL
"https://gitee.com/quicksilver/googletest/repository/archive/release-${GTEST_VERSION}.zip" )
endif()
message( STATUS "Building gtest-${GTEST_VERSION} from source" )
include( FetchContent )
set( CMAKE_POLICY_DEFAULT_CMP0022 NEW ) # for googletest only
FetchContent_Declare(
googletest
URL ${GTEST_SOURCE_URL}
URL_MD5 "f9137c5bc18b7d74027936f0f1bfa5c8"
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
URL ${GTEST_SOURCE_URL}
URL_MD5 "f9137c5bc18b7d74027936f0f1bfa5c8"
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest-src
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
)
if ( NOT googletest_POPULATED )
FetchContent_Populate( googletest )
# Adding the following targets:
# gtest, gtest_main, gmock, gmock_main
add_subdirectory( ${googletest_SOURCE_DIR}
${googletest_BINARY_DIR}
EXCLUDE_FROM_ALL
)
EXCLUDE_FROM_ALL )
endif()
# ****************************************************************

View File

@ -15,8 +15,7 @@ if ( DEFINED ENV{MILVUS_YAMLCPP_URL} )
set( YAMLCPP_SOURCE_URL "$ENV{MILVUS_YAMLCPP_URL}" )
else()
set( YAMLCPP_SOURCE_URL
"https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${YAMLCPP_VERSION}.tar.gz"
"https://gitee.com/quicksilver/yaml-cpp/repository/archive/yaml-cpp-${YAMLCPP_VERSION}.zip" )
"https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${YAMLCPP_VERSION}.tar.gz" )
endif()
message( STATUS "Building yaml-cpp-${YAMLCPP_VERSION} from source" )