Commit 2aa95f0e authored by groot's avatar groot
Browse files

rename some compile virables 


Former-commit-id: 92fa372a07e712547eaa1f447ae0043f08a23d4d
parent addcc638

.clang-tidy-ignore

+0 −2
Original line number Diff line number Diff line
@@ -15,5 +15,3 @@ 
# specific language governing permissions and limitations

# under the License.

#
 
# ipc-adapter-test.cc

# memory-pool-test.cc

core/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -7,5 +7,4 @@ base.info 
output.info

output_new.info

server.info

thirdparty/knowhere/

*.pyc

core/src/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ include_directories(${CUDA_TOOLKIT_ROOT_DIR}/include) 
include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-status)

include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus)



#this statement must put here, since the CORE_INCLUDE_DIRS is defined in code/CMakeList.txt

#this statement must put here, since the INDEX_INCLUDE_DIRS is defined in code/CMakeList.txt

add_subdirectory(index)



set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)

foreach (dir ${CORE_INCLUDE_DIRS})

set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)

foreach (dir ${INDEX_INCLUDE_DIRS})

    include_directories(${dir})

endforeach ()

core/src/index/CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ else() 
endif()

message(STATUS "Build type = ${BUILD_TYPE}")



set(CORE_SOURCE_DIR ${PROJECT_SOURCE_DIR})

set(CORE_BINARY_DIR ${PROJECT_BINARY_DIR})

set(INDEX_SOURCE_DIR ${PROJECT_SOURCE_DIR})

set(INDEX_BINARY_DIR ${PROJECT_BINARY_DIR})

message(STATUS "Core source dir: ${PROJECT_SOURCE_DIR}")

message(STATUS "Core binary dir: ${PROJECT_BINARY_DIR}")

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CORE_SOURCE_DIR}/cmake")

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${INDEX_SOURCE_DIR}/cmake")



include(ExternalProject)

include(DefineOptionsCore)
@@ -92,7 +92,7 @@ if (BUILD_COVERAGE STREQUAL "ON") 
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")

endif()



set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)

set(INDEX_INCLUDE_DIRS ${INDEX_INCLUDE_DIRS} PARENT_SCOPE)



if(BUILD_UNIT_TEST STREQUAL "ON")

    add_subdirectory(unittest)

core/src/index/cmake/BuildUtilsCore.cmake

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ function(ExternalProject_Use_Cache project_name package_file install_path) 
            "Extracting ${package_file} to ${install_path}"

            COMMAND

            ${CMAKE_COMMAND} -E tar xzvf ${package_file} ${install_path}

            WORKING_DIRECTORY ${CORE_BINARY_DIR}

            WORKING_DIRECTORY ${INDEX_BINARY_DIR}

            )



    ExternalProject_Add_StepTargets(${project_name} extract)