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

core/src/index/CMakeLists.txt

@@ -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")

core/unittest/CMakeLists.txt

@@ -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")