提交 426e515b 编写于 作者: J jinhai

Merge branch '0.5.0' into '0.5.0'

0.5.0

See merge request megasearch/milvus!748

Former-commit-id: bdc27837d578583781ababed5d0ca7c7b0858018
...@@ -56,7 +56,7 @@ define_option(MILVUS_VERBOSE_THIRDPARTY_BUILD ...@@ -56,7 +56,7 @@ define_option(MILVUS_VERBOSE_THIRDPARTY_BUILD
"Show output from ExternalProjects rather than just logging to files" ON) "Show output from ExternalProjects rather than just logging to files" ON)
define_option(MILVUS_BOOST_VENDORED "Use vendored Boost instead of existing Boost. \ define_option(MILVUS_BOOST_VENDORED "Use vendored Boost instead of existing Boost. \
Note that this requires linking Boost statically" ON) Note that this requires linking Boost statically" OFF)
define_option(MILVUS_BOOST_HEADER_ONLY "Use only BOOST headers" OFF) define_option(MILVUS_BOOST_HEADER_ONLY "Use only BOOST headers" OFF)
......
...@@ -96,9 +96,9 @@ set(prometheus_lib ...@@ -96,9 +96,9 @@ set(prometheus_lib
) )
set(boost_lib set(boost_lib
boost_system_static boost_system
boost_filesystem_static boost_filesystem
boost_serialization_static boost_serialization
) )
set(cuda_lib set(cuda_lib
......
#!/bin/bash #!/bin/bash
sudo apt-get install -y gfortran libmysqlclient-dev mysql-client libcurl4-openssl-dev sudo apt-get install -y gfortran libmysqlclient-dev mysql-client libcurl4-openssl-dev libboost-system-dev libboost-filesystem-dev libboost-serialization-dev
sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so sudo ln -s /usr/lib/x86_64-linux-gnu/libmysqlclient.so /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册