Commit e250c95b authored by jinhai's avatar jinhai
Browse files

Merge branch '0.5.0' into '0.5.0' 

0.5.0

See merge request megasearch/milvus!748

Former-commit-id: 93cea40e792015e2577d23c701abaf749b45dc5d
parents 5196485f 038f14fd

core/cmake/DefineOptions.cmake

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ define_option(MILVUS_VERBOSE_THIRDPARTY_BUILD 
        "Show output from ExternalProjects rather than just logging to files" ON)



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)

core/src/CMakeLists.txt

+3 −3
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ set(prometheus_lib 
        )



set(boost_lib

        boost_system_static

        boost_filesystem_static

        boost_serialization_static

        boost_system

        boost_filesystem

        boost_serialization

        )



set(cuda_lib

core/ubuntu_build_deps.sh

+1 −1
Original line number Diff line number Diff line 
#!/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