Merge branch 'branch-0.3.1' into 'branch-0.3.1'

MS-248 fix build issue

See merge request megasearch/milvus!237

Former-commit-id: 436723be2bb55204e43aaed2a05ce4e9415a04f4

cpp/src/CMakeLists.txt

@@ -63,6 +63,10 @@ include_directories("${CUDA_TOOLKIT_ROOT_DIR}/include")
 include_directories(thrift/gen-cpp)
 include_directories(/usr/include/mysql)
 
+if (MILVUS_ENABLE_PROFILING STREQUAL "ON")
+    SET(PROFILER_LIB profiler)
+endif()
+
 set(third_party_libs
         easyloggingpp
         sqlite
@@ -82,7 +86,7 @@ set(third_party_libs
         zlib
         zstd
         mysqlpp
-        profiler
+        ${PROFILER_LIB}
         ${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs/libnvidia-ml.so
         )