github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-12-27 13:00:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
159 Commits 5 Branches 28 Tags 6.8 MiB
6f692460e7
Commit Graph

159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evgeny Safronov
6f692460e7 Update readme. 
Added Travis build status badge.
 2014-11-14 11:11:45 +04:00
Evgeny Safronov
35c29c7d2f Added c++11 support for Travis. 2014-11-12 14:30:57 +04:00
Evgeny Safronov
e4d41f8a23 Using Travis as CI. 2014-11-12 13:32:00 +04:00
Dominic Hamon
d750144542 Merge pull request #60 from everbase/master 
added googletest dependency to tests (allows compilation with -j)
 2014-10-31 21:39:28 -07:00
Niklas Hofmann
27aa01a3f9 remove -Wzero-as-null-pointer-constant flag for now 2014-10-26 03:23:15 +01:00
Niklas Hofmann
b04211cc88 Merge branch 'master' of github.com:google/benchmark 2014-10-25 18:35:35 +02:00
Chris Kennelly
f9ef4f4edf Merge pull request #59 from zjx20/instance_mutex 
Turn the global mutex into instance variables
 2014-10-18 15:34:11 -07: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
Chris Kennelly
5f31f0dca2 Merge pull request #57 from google/flag_variants 
Fix #54 by correcting reference to CXX flags for variants.
 2014-10-18 15:33:07 -07:00
Chris Kennelly
06201b3429 Merge pull request #56 from google/pthread_dependency 
Move pthread dependency to test CMakeLists.txt
 2014-10-18 15:32:31 -07:00
Niklas Hofmann
3e9264dcf1 added googletest dependency to tests (allows compilation with -j) 2014-10-16 19:17:08 +02:00
x.zhou
4a3348ce22 Turn the global mutex into instance variables 
To fix #52
 2014-10-12 18:01:45 +08:00
Dominic Hamon
e6107a781c Fix #50 by using nullptr and adding stricter warning. 2014-10-11 15:52:50 -07:00
Dominic Hamon
f98c5760fe Fix #54 by correcting reference to CXX flags for variants. 2014-10-11 15:13:00 -07:00
Dominic Hamon
a13627bc3a Move pthread dependency to test CMakeLists.txt 2014-10-11 14:57:45 -07:00
zjx20
0fcd190cd6 Update CONTRIBUTORS 2014-10-05 16:13:35 +08:00
zjx20
b6e5977132 Update AUTHORS 2014-10-05 16:12:31 +08:00
Dominic Hamon
cfb34b5957 Merge branch 'mattyclarkson-regex' 2014-08-22 11:31:03 -07:00
Matt Clarkson
9593e64076 Fixed the CMake add_cxx_compiler_flag function 2014-08-22 14:56:12 +01:00
Matt Clarkson
0fd0be9789 Added more complicated regex test patterns 2014-08-22 14:55:46 +01:00
Matt Clarkson
f043826542 C++11 regular expressions 2014-08-22 14:55:46 +01: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
Dominic Hamon
d32c5c6442 Merge pull request #47 from mattyclarkson/benchmark_test 
Make sure all benchmark tests run
 2014-08-19 21:17:20 -07:00
Matt Clarkson
1176936966 Check the number of benchmark tests ran 
Previously the benchmark_test program executed the benchmark tests to make sure
the API was working but was not checking the number of tests that were
completed. If the regular expression matching breaks, zero tests could be ran.
Similarly, if one of the APIs breaks and doesn't run the correct amount of tests
then `make test` will catch this.
 2014-08-15 11:09:23 +01:00
Matt Clarkson
92ddf09f1d Ignore the result of make test 2014-08-15 11:09:23 +01:00
Matt Clarkson
38c27c2cb3 Do not use CMake CONCAT 
CONCAT was added quite late in the CMake release cycles so lets use `set()`
instead which has been around _forever_...
 2014-08-15 11:09:22 +01:00
Dominic Hamon
b1041fc3d9 Merge pull request #48 from mattyclarkson/gtest_verify 
Verify gtest with URL_MD5
 2014-08-08 16:38:05 -07: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
Dominic Hamon
0e494bcb34 Merge pull request #46 from mattyclarkson/gtest_verify 
Verify the download of gtest
 2014-08-07 10:20:46 -07:00
Matt Clarkson
d2aa5c1eb3 Verify the download of gtest 2014-08-07 17:58:30 +01:00
Matt Clarkson
373cc41100 C++11 concurrency instead of pthread 2014-08-06 10:50:21 -07: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
Dominic Hamon
4940eebf65 Merge pull request #42 from mattyclarkson/versioning 
Implemented git versioning
 2014-08-01 21:10:48 -07: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
Dominic Hamon
890908c197 Merge pull request #39 from mattyclarkson/fixes 
Allow shared libraries with BUILD_SHARED_LIBS
 2014-07-30 10:15:55 -07:00
Matt Clarkson
57fdf38f74 Allow shared libraries with BUILD_SHARED_LIBS 2014-07-30 18:08:54 +01:00
Matt Clarkson
4fae2944c7 Added Matt Clarkson as a contributor 2014-07-30 18:06:52 +01:00
Matt Clarkson
ace6464b28 Made AUTHORS and CONTRIBUTES alphabetical 2014-07-30 18:06:52 +01:00
Dominic Hamon
20ac20ac77 Merge branch 'eddyxu-mac' 2014-07-27 15:48:03 -07:00
Dominic Hamon
b30603094a Merge branch 'mac' of git://github.com/eddyxu/benchmark into eddyxu-mac 2014-07-27 15:47:25 -07:00
Dominic Hamon
2d835a0c82 Merge pull request #38 from eddyxu/authors 
Add Lei Xu to AUTHORS and CONTRIBUTORS
 2014-07-27 15:46:10 -07:00
Lei Xu
0b19192fb0 Add Lei Xu to AUTHORS and CONTRIBUTORS 2014-07-25 08:15:46 -07: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
Dominic Hamon
f1e1ccafcc Merge pull request #34 from predmond/master 
fix examples to use SetBytesProcessed
 2014-07-24 13:14:49 -07:00