Commit 6f907a1e authored by quicksilver's avatar quicksilver
Browse files

fix CUSTOMIZATION options bug 


Former-commit-id: d92380c80027c970ca942c9e611e4c6f8c1b0176
parent 325bb1dc

core/CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ set(MILVUS_SOURCE_DIR ${PROJECT_SOURCE_DIR}) 
set(MILVUS_BINARY_DIR ${PROJECT_BINARY_DIR})

set(MILVUS_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src)



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



include(ExternalProject)

include(DefineOptions)

include(BuildUtils)

core/src/CMakeLists.txt

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ include_directories(${MILVUS_ENGINE_SRC}/grpc/gen-milvus) 


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

add_subdirectory(index)



if (CUSTOMIZATION)

    add_definitions(-DCUSTOMIZATION)

endif (CUSTOMIZATION)



set(CORE_INCLUDE_DIRS ${CORE_INCLUDE_DIRS} PARENT_SCOPE)

foreach (dir ${CORE_INCLUDE_DIRS})

    include_directories(${dir})

core/src/index/cmake/ThirdPartyPackagesCore.cmake

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ if(CUSTOMIZATION) 
    message(STATUS "Check the remote cache file ${FAISS_SOURCE_URL}. return code = ${return_code}")

    if (NOT return_code EQUAL 0)

        set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/v1.5.3.tar.gz")

        set(CUSTOMIZATION FALSE PARENT_SCOPE)

    endif()

else()

    set(FAISS_SOURCE_URL "https://github.com/facebookresearch/faiss/archive/v1.5.3.tar.gz")