diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt index 425e5a0d43..ad8ce258c9 100644 --- a/src/core/tests/CMakeLists.txt +++ b/src/core/tests/CMakeLists.txt @@ -10,11 +10,10 @@ set(MY_PROJ_INC_PATH ../core ../tools/common ../tools/simulator ../tools/hpc ../tools/nfs ) -set(MY_BOOST_PACKAGES system filesystem) +set(MY_BOOST_PACKAGES system filesystem regex) set(MY_PROJ_LIBS gtest dsn_runtime - boost_regex ) set(MY_PROJ_LIB_PATH "${GTEST_LIB_DIR}") diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index 2d705a4f05..9f878a792d 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -164,7 +164,7 @@ fi # build libevent if [ ! -d $TP_OUTPUT/include/event2 ]; then - cd $TP_SRC/libevent-release-2.0.22-stable + cd $TP_SRC/libevent-release-2.1.8-stable ./autogen.sh ./configure --enable-shared=no --disable-debug-mode --prefix=$TP_OUTPUT --with-pic=yes make -j8 && make install @@ -275,3 +275,16 @@ if [ ! -d $TP_OUTPUT/include/s2 ]; then else echo "skip build s2geometry" fi + +# build gflags +if [ ! -d $TP_OUTPUT/include/gflags ]; then + cd $TP_SRC/gflags-2.2.1 + mkdir -p build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=$TP_OUTPUT + make -j8 && make install + res=$? + exit_if_fail "gflags" $res + cd $TP_DIR +else + echo "skip build gflags" +fi diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index 77f6e06571..07ccdda1a2 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -162,10 +162,10 @@ check_and_download "zookeeper-3.4.10.tar.gz"\ exit_if_fail $? # libevent for send http request -check_and_download "libevent-2.0.22.tar.gz"\ - "https://codeload.github.com/libevent/libevent/tar.gz/release-2.0.22-stable"\ - "8913ef56ec329f2c046007bd634c7201"\ - "libevent-release-2.0.22-stable" +check_and_download "libevent-2.1.8.tar.gz"\ + "https://github.com/libevent/libevent/archive/release-2.1.8-stable.tar.gz"\ + "80f8652e4b08d2ec86a5f5eb46b74510"\ + "libevent-release-2.1.8-stable" exit_if_fail $? # poco 1.7.8 @@ -195,6 +195,13 @@ check_and_download "fmt-4.0.0.tar.gz"\ "fmt-4.0.0" exit_if_fail $? +# gflags +check_and_download "gflags-2.2.1.zip"\ + "https://github.com/gflags/gflags/archive/v2.2.1.zip"\ + "2d988ef0b50939fb50ada965dafce96b"\ + "gflags-2.2.1" +exit_if_fail $? + # s2geometry check_and_download "s2geometry-master.zip"\ "https://github.com/google/s2geometry/archive/master.zip"\