Conversation
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.
Member
There was a problem hiding this comment.
any reason why you moved this up?
Contributor
Author
There was a problem hiding this comment.
I felt like it didn't make sense that it lived between the add_cxx_compiler_flag(...) and cxx_feature_check(...) blocks. Those seem to be logically related to each other and setting the SO version there seemed out of place.
Member
|
LGTM modulo failing build |
EricWF
added a commit
that referenced
this pull request
Mar 9, 2015
Step one towards merging timer changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This patch cleans up our use of generic macros and also merges changes in the
build system.
It adds the CMake options:
*-DBENCHMARK_ENABLE_TESTING: Turn on building googletest and the testsuite.
This patch also removes a bunch of travis build matrix entries that are unneeded. Instead of having one entry to run the benchmark tests and another entry to run the regex tests there is now one that runs both.