X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=README.md;h=e8bff508911d12389fb305be213ed87b44eead5d;hp=451ad71d8b9df711d88a3fc1df53aea5842d800d;hb=fc91e3033ab178ae85b54594f7dd09594de19b57;hpb=6bb67df053d6e8012cd035ba99a63ad260f75c45 diff --git a/README.md b/README.md index 451ad71d..e8bff508 100644 --- a/README.md +++ b/README.md @@ -70,11 +70,18 @@ Folly is published on Github at https://github.com/facebook/folly #### Dependencies -folly requires gcc 4.8+ and a version of boost compiled with C++11 support. +folly requires gcc 4.9+ and a version of boost compiled with C++14 support. Please download googletest from -https://googletest.googlecode.com/files/gtest-1.7.0.zip and unzip it in the -folly/test subdirectory. +https://github.com/google/googletest/archive/release-1.8.0.tar.gz and unpack it into the +folly/test subdirectory as `gtest`: + + (cd folly/test && \ + rm -rf gtest && \ + wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz && \ + tar zxf release-1.8.0.tar.gz && \ + rm -f release-1.8.0.tar.gz && \ + mv googletest-release-1.8.0 gtest) #### Ubuntu 12.04 @@ -106,10 +113,11 @@ sudo apt-get install \ zlib1g-dev \ binutils-dev \ libjemalloc-dev \ - libssl-dev + libssl-dev \ + pkg-config ``` -If advanced debugging functionality for tests are required +If advanced debugging functionality is required ``` sudo apt-get install \ @@ -147,8 +155,6 @@ You may also use `folly/build/bootstrap-osx-homebrew.sh` to build against `maste ``` cd folly ./build/bootstrap-osx-homebrew.sh - make - make check ``` #### OS X (MacPorts)