Commit Graph

55 Commits

Author SHA1 Message Date
Steve Downey 2149577f89 Add export linker flags policy to cmake (#251)
Add policy CMP0056, which honors the link flags in try_compile and
try_run. This allows for building against non-system libc++ by providing
the correct -L and rpath options in a containing project.

For example:

    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L ${LLVM_ROOT}/lib -l c++ -l c++abi")
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,${LLVM_ROOT}/lib")
2016-07-06 12:36:56 -07:00
Billy Robert O'Neal III 09edc486b8 Added GCC/Clang support for other rel configs 2016-05-10 16:47:06 -07:00
Billy Robert O'Neal III d89ab075fd Added support for CMake's other rel configs
In addition to release, CMake supports RELWITHDEBINFO and MINSIZEREL
build configurations. In particular, debug info is necessary for many
profilers to do anything useful, making RELWITHDEBINFO important here.

MINSIZEREL was added for completeness' sake.
2016-05-10 16:47:06 -07:00
Billy Robert O'Neal III 9bb1ba6b76 Fix clobbering of default CMAKE_CXX_FLAGS_RELEASE
BENCHMARK_ENABLE_LTO=true was completely replacing
CMAKE_CXX_FLAGS_RELEASE; meaning neither CMake's release defaults nor
user customizations were being applied.
2016-05-10 16:47:06 -07:00
Billy Robert O'Neal III 60b5921735 Remove redundant MSVC++ /W3 triggering warnings
This change looks for CMake's default setting for MSVC++, /W3 (and any
other level should that change in the future), and removes it before
adding /W4. This stops the build for MSVC++ emitting warnings about
/W4 overriding /W3 earlier on the command line.
2016-05-10 16:47:06 -07:00
Arkadiy Shapkin 9e37d69b23 Support MSVC on appveyor 2016-02-12 23:12:29 +03:00
Anton Danielsson 9195fd07d6 Revert "Added Wconversion so the gcc/clang warnings will be more similar to W4 on MSVC."
This reverts commit 0a2bd8935391e42f2581ec4826f7ac5f8fc9041a.
2015-10-08 10:48:44 +02:00
Anton Danielsson 0a8e0dbb0b Added Wconversion so the gcc/clang warnings will be more similar to W4 on MSVC.
This also points out some important issues like:
warning: conversion to 'size_t {aka unsigned int}' from 'long long int' may alter its value [-Wconversion]
   state.SetBytesProcessed(items_processed * sizeof(v));
This occurs on 32 bit systems where size_t is only 32 bits.
2015-10-08 10:48:37 +02:00
Anton Danielsson 53b1896c53 Added _CRT_SECURE_NO_WARNINGS under MSVC. 2015-10-08 10:48:29 +02:00
Anton Danielsson 02440964e8 Changed MSVC warnings from Wall to W4 to avoid 10000+ warnings from stl/windows headers. 2015-10-08 10:47:34 +02:00
Matt Clarkson 344775db63 Enable strict aliasing warnings 2015-05-13 09:17:48 +01:00
Matt Clarkson 36c1eb6975 Coverage support with LCOV and GCOV
This patch adds a `coverage` target that allows coverage statisitics to be
retrieved for the project. It requires that lcov and gcov is installed and
that the generator is unix makefiles but this can be improved upon in
future releases.

To make it work use the coverage build type:

```
cmake -DCMAKE_BUILD_TYPE=Coverage .
make coverage
```
2015-05-13 09:17:38 +01:00
Matt Clarkson 3314aa43c2 Allow the user to set the C++ standard to use
This is useful to test the library at different standard levels. Currently
doesn't search for C++14 in 'auto' mode. Can enable in the future
2015-05-12 17:15:41 +01:00
Matt Clarkson e44ee2d005 Group common C++ flags 2015-05-12 17:15:41 +01:00
Matt Clarkson bb23a9b9f2 Compile with link time optimisation
Can provide speed improvements
2015-05-12 17:15:38 +01:00
Matt Clarkson 7418bbbbac Only warn on errors in release mode
This improves development iterations when working in debug mode as you
don't have to fix up warnings to get the code to compile. Once a feature
is complete you can then run a release build and fix up all the warnings.
2015-05-05 12:11:43 +01:00
Dominic Hamon 1e0ed3a21c Rearrange the pieces 2015-04-03 13:33:54 -07:00
Geoff Romer dcb1a3dad4 Drop down to CMake 2.8.11, and drop INTERFACE since that version doesn't
support it.
2015-04-03 13:30:59 -07:00
Geoff Romer 89a1edae15 Require cmake 2.8.12 in order to support target_include_directories, and
simplify thread linking logic.
2015-04-03 13:30:59 -07:00
Eric Fiselier 8bb991d099 Remove BENCHMARK_ENABLE_SHARED and prefer BUILD_SHARED_LIBS 2015-04-01 11:34:38 -04:00
Eric Fiselier d3e0671a87 finish selection of clock with debug information 2015-03-26 17:52:28 -04:00
Eric Fiselier 7f2ef46255 merge master 2015-03-17 12:35:11 -04:00
Eric Fiselier 1924b30a6c Merge null pointer warnings 2015-03-17 12:21:20 -04:00
Eric Fiselier 66bf7c8f71 add floating point comparison warnings 2015-03-12 20:27:29 -04:00
Eric Fiselier f022d780eb Enable int shortening warnings 2015-03-12 20:17:40 -04:00
Eric Fiselier 64ba272911 Enable zero as NULL warnings and fix all occurences 2015-03-12 19:16:06 -04:00
Eric Fiselier 7a767012f1 Adopt new benchmark timing internals.
This patch adopts a new internal structure for how timings are performed.
Currently every iteration of a benchmark checks to see if it has been running
for an appropriate amount of time. Checking the clock introduces noise into
the timings and this can cause inconsistent output from each benchmark.

Now every iteration of a benchmark only checks an iteration count to see if it
should stop running. The iteration count is determined before hand by testing
the benchmark on a series of increasing iteration counts until a suitable count
is found. This increases the amount of time it takes to run the actual benchmarks
but it also greatly increases the accuracy of the results.

This patch introduces some breaking changes. The notable breaking changes are:
1. Benchmarks run on multiple threads no generate a report per thread. Instead
   only a single report is generated.
2. ::benchmark::UseRealTime() was removed and replaced with State::UseRealTime().
2015-03-12 18:03:33 -04:00
Eric Fiselier 5b41e128b3 Step one towards merging timer changes.
This patch cleans up our use of generic macros and also merges changes in the
build system.

It adds options -DBENCHMARK_ENABLE_TESTING and -DBENCHMARK_ENABLE_SHARED.
2015-03-06 12:35:00 -05:00
Pavel Davydov 26c01ee9ab Fix #77 add FreeBSD detection in cmake 2015-02-21 17:23:20 +03:00
Eric Fiselier 114886100b Don't use c++14 2015-02-19 16:38:30 -05:00
Niklas Hofmann 27aa01a3f9 remove -Wzero-as-null-pointer-constant flag for now 2014-10-26 03:23:15 +01:00
Chris Kennelly 8eac5dc328 Merge pull request #58 from google/zero_null
Fix #50 by using nullptr and adding stricter warning.
2014-10-18 15:33:40 -07:00
Dominic Hamon e6107a781c Fix #50 by using nullptr and adding stricter warning. 2014-10-11 15:52:50 -07:00
Dominic Hamon a13627bc3a Move pthread dependency to test CMakeLists.txt 2014-10-11 14:57:45 -07:00
Matt Clarkson edfa60a1d1 Resolve regular expression engines 2014-08-22 14:55:46 +01:00
Matt Clarkson fac16a662e CMakeLists.txt comments 2014-08-20 08:42:30 +01:00
Matt Clarkson 1c82191d7a Consistent indentation in CMakeLists.txt 2014-08-20 08:42:29 +01:00
Matt Clarkson 6a66991586 Verify gtest with URL_MD5 2014-08-08 13:46:04 +01:00
Dominic Hamon ed08661efe Remove URL_HASH as it is unsupported 2014-08-07 10:28:55 -07:00
Matt Clarkson d2aa5c1eb3 Verify the download of gtest 2014-08-07 17:58:30 +01:00
Matt Clarkson 6b1a6958c4 CMake function for adding compiler flags 2014-08-04 10:01:44 +01:00
Matt Clarkson 6945096ba1 Add -Wshadow if supported 2014-08-04 10:01:44 +01:00
Matt Clarkson e863292dcc Detect compiler flags and append to default CMake flags 2014-08-04 10:01:44 +01:00
Matt Clarkson c927845d5a get_git_version CMake function 2014-08-01 15:02:32 +01:00
Matt Clarkson d591edf513 Implemented git versioning
This patch automatically versions the shared libraries from any annotated `git`
tags:

```
git tag -a v1.0.0
```

It expects semver version tags such as `v1.0.0`. It would be trivial to support
`1.0.0` but looking around it seems that most C/C++ projects follow `vX.X.X`
rather that `X.X.X` like a lot of `Node.js` stuff.

This determines that the if the project has had a certain amount of commits
since the last tag and also if the project is _dirty_ (has modified files), but
does __nothing__ with that information. In the future a more robust release
could be implemented in the script.

This is pretty brittle and has little in the way of configuration. Ideally we
should use `find_program` to work out where `git` is so that users can configure
it. This implementation assumes that `git` will be available in `PATH`

Outputs the following on the command line:

```
-- git Version: v[MAJOR].[MINOR].[PATCH]-[COMMITS_SINCE_TAG]-[SHA1](-dirty)?
-- Version: [MAJOR].[MINOR].[PATCH]
```
2014-08-01 09:20:28 +01:00
Matt Clarkson 57fdf38f74 Allow shared libraries with BUILD_SHARED_LIBS 2014-07-30 18:08:54 +01:00
Lei Xu 3460bf1aa6 Fixed compiling on Mac 10.9.3 with g++-4.8, clang or system c++ 2014-07-24 23:57:09 -07:00
Chris Kennelly 92cd2e82af Remove URL_HASH and TLS_VERIFY from CMake configuration.
Per the CMake 2.8.0 documentation, these options did not exist for
ExternalProject_Add.  These options were added in CMake 2.8.10.
2014-04-23 14:23:20 -07:00
Chris Kennelly 6087edda9d Add ExternalProject reference to Google Test 1.7.0. 2014-04-23 00:55:36 -07:00
Chris Kennelly e38fde6450 Setup targets from each directory, rather than the top-level. 2014-04-23 00:47:07 -07:00