Merge branch 'branch-0.5.0' into 'branch-0.5.0'

cpplint setting

See merge request megasearch/milvus!612

Former-commit-id: 75ac3254ed156ebe7f0a756a3b29f98115bb5fc7
This commit is contained in:
peng.xu 2019-09-26 11:03:01 +08:00
commit dc9d0a646c
3 changed files with 6 additions and 3 deletions

View File

@ -44,7 +44,6 @@ set(MILVUS_VERSION "${GIT_BRANCH_NAME}")
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]" MILVUS_VERSION "${MILVUS_VERSION}")
find_package(ClangTools)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(BUILD_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/build-support")
if(CMAKE_BUILD_TYPE STREQUAL "Release")
@ -57,6 +56,9 @@ message(STATUS "Build type = ${BUILD_TYPE}")
project(milvus VERSION "${MILVUS_VERSION}")
project(milvus_engine LANGUAGES CUDA CXX)
unset(CMAKE_EXPORT_COMPILE_COMMANDS CACHE)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(MILVUS_VERSION_MAJOR "${milvus_VERSION_MAJOR}")
set(MILVUS_VERSION_MINOR "${milvus_VERSION_MINOR}")
set(MILVUS_VERSION_PATCH "${milvus_VERSION_PATCH}")

View File

@ -3,4 +3,5 @@
*cmake_build*
*src/thirdparty*
*src/core/thirdparty*
*src/grpc*
*src/grpc*
*easylogging++*

View File

@ -84,7 +84,7 @@ if __name__ == "__main__":
cmd = [
arguments.cpplint_binary,
'--verbose=2',
'--linelength=90',
'--linelength=120',
'--filter=' + ','.join(_filters)
]
if (arguments.cpplint_binary.endswith('.py') and