Commit e20c04d7 authored by peng.xu's avatar peng.xu
Browse files

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

cpplint setting

See merge request megasearch/milvus!612

Former-commit-id: aa40268df61f5f7bc624b4dda7da114e8090da05
parents f1f23110 cbe5d00f

cpp/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -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}")

cpp/build-support/lint_exclusions.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
*src/thirdparty*

*src/core/thirdparty*

*src/grpc*

*easylogging++*
 
 No newline at end of file

cpp/build-support/run_cpplint.py

+1 −1
Original line number Diff line number Diff line
@@ -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