From 75e1fa90e127d5ca93aa06940007c21676c18a1a Mon Sep 17 00:00:00 2001
From: starlord <chxiehust@gmail.com>
Date: Wed, 14 Aug 2019 17:09:33 +0800
Subject: [PATCH 1/2] for jenkins build

Former-commit-id: fa78b4d2201879fd6fe2619d2b0e498c5f9bf433
---
 cpp/.gitignore |  1 -
 cpp/build.sh   | 15 +++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/cpp/.gitignore b/cpp/.gitignore
index 718081be75..71ee3f3770 100644
--- a/cpp/.gitignore
+++ b/cpp/.gitignore
@@ -2,7 +2,6 @@ milvus/
 conf/server_config.yaml
 conf/log_config.conf
 version.h
-megasearch/
 lcov_out/
 base.info
 output.info
diff --git a/cpp/build.sh b/cpp/build.sh
index 1baad7d1c6..a4b7080ee3 100755
--- a/cpp/build.sh
+++ b/cpp/build.sh
@@ -11,8 +11,9 @@ PROFILING="OFF"
 BUILD_FAISS_WITH_MKL="OFF"
 USE_JFROG_CACHE="OFF"
 KNOWHERE_OPTS=""
+KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere/knowhere"
 
-while getopts "p:d:t:uhlrcgmj" arg
+while getopts "p:d:t:uhlrcgkmj" arg
 do
         case $arg in
              t)
@@ -44,6 +45,9 @@ do
              g)
                 PROFILING="ON"
                 ;;
+             k)
+                KNOWHERE_BUILD_DIR=$OPTARG
+                ;;
              m)
                 BUILD_FAISS_WITH_MKL="ON"
                 ;;
@@ -63,11 +67,12 @@ parameter:
 -r: remove previous build directory(default: OFF)
 -c: code coverage(default: OFF)
 -g: profiling(default: OFF)
+-k: specify knowhere header/binary path
 -m: build faiss with MKL(default: OFF)
 -j: use jfrog cache build directory
 
 usage:
-./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c] [-m] [-j]
+./build.sh -t \${BUILD_TYPE} [-u] [-h] [-g] [-r] [-c] [-k] [-m] [-j]
                 "
                 exit 0
                 ;;
@@ -83,12 +88,6 @@ if [[ ! -d cmake_build ]]; then
 	MAKE_CLEAN="ON"
 fi
 
-# Knowhere build output path
-KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere/knowhere"
-pushd `pwd`/thirdparty/knowhere
-./build.sh -t ${BUILD_TYPE} -p ${KNOWHERE_BUILD_DIR} ${KNOWHERE_OPTS}
-popd
-
 cd cmake_build
 
 CUDA_COMPILER=/usr/local/cuda/bin/nvcc

From 7047472cf7a026700865eb2b0ec09becf15785b2 Mon Sep 17 00:00:00 2001
From: starlord <chxiehust@gmail.com>
Date: Wed, 14 Aug 2019 17:13:02 +0800
Subject: [PATCH 2/2] for jenkins build

Former-commit-id: e69f393d71c54489917100acc18d125ded248471
---
 cpp/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/build.sh b/cpp/build.sh
index a4b7080ee3..104ecc89d3 100755
--- a/cpp/build.sh
+++ b/cpp/build.sh
@@ -13,7 +13,7 @@ USE_JFROG_CACHE="OFF"
 KNOWHERE_OPTS=""
 KNOWHERE_BUILD_DIR="`pwd`/thirdparty/knowhere/knowhere"
 
-while getopts "p:d:t:uhlrcgkmj" arg
+while getopts "p:d:t:k:uhlrcgmj" arg
 do
         case $arg in
              t)