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

MS-658 SQ8Hybrid can't search

See merge request megasearch/milvus!729

Former-commit-id: a942782d3d05e3f0a4e56357dcf6c5f0cd643a7b
This commit is contained in:
jinhai 2019-10-15 14:38:26 +08:00
commit 6bbd8be609
2 changed files with 7 additions and 0 deletions

View File

@ -86,6 +86,10 @@ include(DefineOptionsCore)
include(BuildUtilsCore)
include(ThirdPartyPackagesCore)
if (CUSTOMIZATION)
add_definitions(-DCUSTOMIZATION)
endif (CUSTOMIZATION)
add_subdirectory(knowhere)
if (BUILD_COVERAGE STREQUAL "ON")

View File

@ -16,6 +16,9 @@
# specific language governing permissions and limitations
# under the License.
#-------------------------------------------------------------------------------
if (CUSTOMIZATION)
add_definitions(-DCUSTOMIZATION)
endif (CUSTOMIZATION)
include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include")