Commit 4c538f1a authored Oct 15, 2019 by jinhai

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: 370fece56b33dff5d9702bc51568cc20fa49396a

parents aa8ab2e8 aa2a5794

core/src/index/CMakeLists.txt

+4 −0

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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")