Skip to content

Commit

Permalink
Merge 581b0bb into b171791
Browse files Browse the repository at this point in the history
  • Loading branch information
dominichamon committed Nov 13, 2018
2 parents b171791 + 581b0bb commit 385a656
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -178,7 +178,7 @@ install:
fi
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo apt-get update -qq;
sudo apt-get install -qq unzip;
sudo apt-get install -qq unzip cmake3;
wget https://github.com/bazelbuild/bazel/releases/download/0.10.1/bazel-0.10.1-installer-linux-x86_64.sh --output-document bazel-installer.sh;
travis_wait sudo bash bazel-installer.sh;
fi
Expand All @@ -188,6 +188,7 @@ install:
fi

script:
- cmake --version
- cmake -DCMAKE_C_COMPILER=${C_COMPILER} -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="${EXTRA_FLAGS}" -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_BUILD_32_BITS=${BUILD_32_BITS} ${EXTRA_OPTIONS} ..
- make
- ctest -C ${BUILD_TYPE} --output-on-failure
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.5.1)

project (benchmark)

Expand Down
3 changes: 3 additions & 0 deletions README.md
Expand Up @@ -51,6 +51,9 @@ First make sure you have git and cmake installed (If not please install them)
sudo apt-get install git cmake
```

_See [dependencies.md](dependencies.md) for more details about the supported
versions of build tools._

Now, let's clone the repository and build it

```
Expand Down
18 changes: 18 additions & 0 deletions dependencies.md
@@ -0,0 +1,18 @@
# Build tool dependency policy

To ensure the broadest compatibility when building the benchmark library, but
still allow forward progress, we require any build tooling to be available for:

* Debian stable AND
* The last two Ubuntu LTS releases AND

Currently, this means using build tool versions that are available for Ubuntu
16.04 (Xenial), Ubuntu 18.04 (Bionic), and Debian stretch.

_Note, [travis](.travis.yml) runs under Ubuntu 14.04 (Trusty) for linux builds._

## cmake
The current supported version is cmake 3.5.1 as of 2018-06-06.

_Note, this version is also available for Ubuntu 14.04, the previous Ubuntu LTS
release, as `cmake3`._

0 comments on commit 385a656

Please sign in to comment.