Skip to content

B
benchmark
Commit d7501445 by Dominic Hamon
Options

Merge pull request #60 from everbase/master

added googletest dependency to tests (allows compilation with -j)
parents f9ef4f4e 27aa01a3
Showing with 3 additions and 1 deletion
CMakeLists.txt
...@@ -37,7 +37,7 @@ add_cxx_compiler_flag(-Wall) ...@@ -37,7 +37,7 @@ add_cxx_compiler_flag(-Wall)
add_cxx_compiler_flag(-Wshadow) add_cxx_compiler_flag(-Wshadow)
add_cxx_compiler_flag(-Werror) add_cxx_compiler_flag(-Werror)
add_cxx_compiler_flag(-pedantic-errors) add_cxx_compiler_flag(-pedantic-errors)
add_cxx_compiler_flag(-Wzero-as-null-pointer-constant) #add_cxx_compiler_flag(-Wzero-as-null-pointer-constant)
# Release flags # Release flags
add_cxx_compiler_flag(-fno-strict-aliasing RELEASE) add_cxx_compiler_flag(-fno-strict-aliasing RELEASE)
......
test/CMakeLists.txt
...@@ -3,6 +3,7 @@ find_package(Threads REQUIRED) ...@@ -3,6 +3,7 @@ find_package(Threads REQUIRED)
# Demonstration executable # Demonstration executable
add_executable(benchmark_test benchmark_test.cc) add_executable(benchmark_test benchmark_test.cc)
target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT})
add_dependencies(benchmark_test googletest)
add_test(benchmark benchmark_test 50) add_test(benchmark benchmark_test 50)
add_test(benchmark_filter_simple benchmark_test --benchmark_filter=Calculate 16) add_test(benchmark_filter_simple benchmark_test --benchmark_filter=Calculate 16)
add_test(benchmark_filter_prefix benchmark_test --benchmark_filter=*Calculate 0) add_test(benchmark_filter_prefix benchmark_test --benchmark_filter=*Calculate 0)
...@@ -13,4 +14,5 @@ add_test(benchmark_filter_regex_wildcard benchmark_test --benchmark_filter=.*Cal ...@@ -13,4 +14,5 @@ add_test(benchmark_filter_regex_wildcard benchmark_test --benchmark_filter=.*Cal
# Test harness for regex wrapper # Test harness for regex wrapper
add_executable(re_test ${RE_FILES} "re_test.cc") add_executable(re_test ${RE_FILES} "re_test.cc")
target_link_libraries(re_test benchmark_re gtest gtest_main ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(re_test benchmark_re gtest gtest_main ${CMAKE_THREAD_LIBS_INIT})
add_dependencies(re_test googletest)
add_test(regex re_test) add_test(regex re_test)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment