提交 0b7d3487 编写于 作者: J jinhai

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

MS-595 Fix compiling error on gcc 7.4

See merge request megasearch/milvus!630

Former-commit-id: 0a29043919a3f1f014bd36046eee1b4c39a2f076
...@@ -50,10 +50,9 @@ Centos7 : ...@@ -50,10 +50,9 @@ Centos7 :
$ yum install gfortran qt4 flex bison $ yum install gfortran qt4 flex bison
$ yum install mysql-devel mysql $ yum install mysql-devel mysql
Ubuntu16.04 : Ubuntu 16.04 or 18.04:
$ sudo apt-get install gfortran qt4-qmake flex bison $ sudo apt-get install gfortran qt4-qmake flex bison
$ sudo apt-get install libmysqlclient-dev mysql-client $ sudo apt-get install libmysqlclient-dev mysql-client
``` ```
Verify the existence of `libmysqlclient_r.so`: Verify the existence of `libmysqlclient_r.so`:
...@@ -66,6 +65,10 @@ $ locate libmysqlclient_r.so ...@@ -66,6 +65,10 @@ $ locate libmysqlclient_r.so
If not, you need to create a symbolic link: If not, you need to create a symbolic link:
```shell ```shell
# Locate libmysqlclient.so
$ sudo updatedb
$ locate libmysqlclient.so
# Create symbolic link # Create symbolic link
$ sudo ln -s /path/to/libmysqlclient.so /path/to/libmysqlclient_r.so $ sudo ln -s /path/to/libmysqlclient.so /path/to/libmysqlclient_r.so
``` ```
...@@ -90,7 +93,7 @@ please reinstall CMake with curl: ...@@ -90,7 +93,7 @@ please reinstall CMake with curl:
```shell ```shell
CentOS 7: CentOS 7:
$ yum install curl-devel $ yum install curl-devel
Ubuntu 16.04: Ubuntu 16.04 or 18.04:
$ sudo apt-get install libcurl4-openssl-dev $ sudo apt-get install libcurl4-openssl-dev
``` ```
...@@ -106,7 +109,7 @@ please reinstall CMake with curl: ...@@ -106,7 +109,7 @@ please reinstall CMake with curl:
```shell ```shell
CentOS 7: CentOS 7:
$ yum install clang $ yum install clang
Ubuntu 16.04: Ubuntu 16.04 or 18.04:
$ sudo apt-get install clang-format clang-tidy $ sudo apt-get install clang-format clang-tidy
$ ./build.sh -l $ ./build.sh -l
...@@ -123,7 +126,7 @@ $ ./build.sh -u ...@@ -123,7 +126,7 @@ $ ./build.sh -u
```shell ```shell
CentOS 7: CentOS 7:
$ yum install lcov $ yum install lcov
Ubuntu 16.04: Ubuntu 16.04 or 18.04:
$ sudo apt-get install lcov $ sudo apt-get install lcov
$ ./build.sh -u -c $ ./build.sh -u -c
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include <string> #include <string>
#include <functional>
#include "task/SearchTask.h" #include "task/SearchTask.h"
#include "event/Event.h" #include "event/Event.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册