dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address comments

This commit is contained in:
Eric Fiselier 2015-03-06 13:20:47 -05:00
parent 5b41e128b3
commit b1f34d3880
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/CMakeLists.txt
View File

@ -2,9 +2,8 @@
include_directories(${PROJECT_SOURCE_DIR}/src) include_directories(${PROJECT_SOURCE_DIR}/src)
# Define the source files # Define the source files
set(SOURCE_FILES "benchmark.cc" "commandlineflags.cc" set(SOURCE_FILES "benchmark.cc" "colorprint.cc" "commandlineflags.cc"
"colorprint.cc" "sleep.cc" "sleep.cc" "sysinfo.cc" "walltime.cc")
"sysinfo.cc" "walltime.cc")
# Determine the correct regular expression engine to use # Determine the correct regular expression engine to use
if(HAVE_STD_REGEX) if(HAVE_STD_REGEX)
set(RE_FILES "re_std.cc") set(RE_FILES "re_std.cc")

5
test/CMakeLists.txt
View File

@ -23,11 +23,6 @@ macro(compile_benchmark_test name)
add_dependencies(${name} googletest) add_dependencies(${name} googletest)
endmacro(compile_benchmark_test) endmacro(compile_benchmark_test)
macro (add_benchmark_test name)
compile_benchmark_test(${name})
add_test(${name} ${name} --benchmarks=all)
endmacro(add_benchmark_test)
macro(add_gtest_test name) macro(add_gtest_test name)
add_executable(${name} "${name}.cc") add_executable(${name} "${name}.cc")
target_link_libraries(${name} benchmark gtest gtest_main ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(${name} benchmark gtest gtest_main ${CMAKE_THREAD_LIBS_INIT})