From 7ba60586bf4fe00392638a3d90103bd066c17e5d Mon Sep 17 00:00:00 2001 From: Snaipe Date: Wed, 5 Aug 2015 06:26:12 +0200 Subject: [PATCH] Updated version numbers and setup steps in documentation --- .bumpversion.cfg | 2 ++ README.md | 8 ++++---- doc/setup.rst | 9 +++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6ea2abb..e8f1054 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -8,3 +8,5 @@ commit = True [bumpversion:file:appveyor.yml] +[bumpversion:file:README.md] + diff --git a/README.md b/README.md index 4182cf2..d58d453 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,10 @@ the user would have with other frameworks: ## Downloads -* [Linux (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.2/criterion-1.2.2-linux-x86_64.tar.bz2) -* [OS X (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.2/criterion-1.2.2-osx-x86_64.tar.bz2) -* [FreeBSD (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.2/criterion-1.2.2-freebsd-x86_64.tar.bz2) -* [Windows (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.2/criterion-1.2.2-windows-x86_64.tar.bz2) +* [Linux (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.3/criterion-1.2.3-linux-x86_64.tar.bz2) +* [OS X (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.3/criterion-1.2.3-osx-x86_64.tar.bz2) +* [FreeBSD (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.3/criterion-1.2.3-freebsd-x86_64.tar.bz2) +* [Windows (x86_64)](https://github.com/Snaipe/Criterion/releases/download/v1.2.3/criterion-1.2.3-windows-x86_64.tar.bz2) If you have a different platform, you can still [build the library from source](http://criterion.readthedocs.org/en/latest/setup.html#installation) diff --git a/doc/setup.rst b/doc/setup.rst index 0182ec0..507fc81 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -6,7 +6,7 @@ Prerequisites Currently, this library only works under \*nix systems. -To compile the static library and its dependencies, GCC 4.9+ is needed. +To compile the static library and its dependencies, GCC 4.6+ is needed. To use the static library, any GNU-C compatible compiler will suffice (GCC, Clang/LLVM, ICC, MinGW-GCC, ...). @@ -16,9 +16,10 @@ Installation .. code-block:: bash - $ git clone https://github.com/Snaipe/Criterion.git - $ cd Criterion - $ ./autogen.sh && ./configure && make && sudo make install + $ git clone https://github.com/Snaipe/Criterion.git && cd Criterion + $ LOCAL_INSTALL=/usr .ci/install-libcsptr.sh + $ mkdir build && cd $_ && cmake -DCMAKE_INSTALL_PATH=/usr .. + $ make && sudo make install Usage -----