Browse Source

Merge pull request #853 from cmumford:benchmark

PiperOrigin-RevId: 344909677
pull/1/head
Chris Mumford 4 years ago
parent
commit
28df52115d
2 changed files with 9 additions and 1 deletions
  1. +3
    -0
      .gitmodules
  2. +6
    -1
      CMakeLists.txt

+ 3
- 0
.gitmodules View File

@ -1,3 +1,6 @@
[submodule "third_party/googletest"] [submodule "third_party/googletest"]
path = third_party/googletest path = third_party/googletest
url = https://github.com/google/googletest.git url = https://github.com/google/googletest.git
[submodule "third_party/benchmark"]
path = third_party/benchmark
url = https://github.com/google/benchmark

+ 6
- 1
CMakeLists.txt View File

@ -298,6 +298,11 @@ if(LEVELDB_BUILD_TESTS)
# This project is tested using GoogleTest. # This project is tested using GoogleTest.
add_subdirectory("third_party/googletest") add_subdirectory("third_party/googletest")
# This project uses Google benchmark for benchmarking.
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
add_subdirectory("third_party/benchmark")
# GoogleTest triggers a missing field initializers warning. # GoogleTest triggers a missing field initializers warning.
if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS) if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
set_property(TARGET gtest set_property(TARGET gtest
@ -318,7 +323,7 @@ if(LEVELDB_BUILD_TESTS)
"${test_file}" "${test_file}"
) )
target_link_libraries("${test_target_name}" leveldb gmock gtest)
target_link_libraries("${test_target_name}" leveldb gmock gtest benchmark)
target_compile_definitions("${test_target_name}" target_compile_definitions("${test_target_name}"
PRIVATE PRIVATE
${LEVELDB_PLATFORM_NAME}=1 ${LEVELDB_PLATFORM_NAME}=1

Loading…
Cancel
Save