mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-17 17:20:07 +02:00
46 lines
1.5 KiB
Plaintext
46 lines
1.5 KiB
Plaintext
From d0c00ec60af4826c49a571a86ffdd9646698a33b Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Fri, 25 Feb 2022 09:03:57 +0100
|
|
Subject: unbundle gtest and benchmark
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index f8285b8..352ba35 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -296,20 +296,12 @@ if(LEVELDB_BUILD_TESTS)
|
|
set(build_gmock ON)
|
|
|
|
# This project is tested using GoogleTest.
|
|
- add_subdirectory("third_party/googletest")
|
|
+ find_package(GTest)
|
|
|
|
# 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.
|
|
- if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
|
- set_property(TARGET gtest
|
|
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
|
- set_property(TARGET gmock
|
|
- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
|
|
- endif(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
|
|
+ find_package(benchmark)
|
|
|
|
function(leveldb_test test_file)
|
|
get_filename_component(test_target_name "${test_file}" NAME_WE)
|
|
@@ -400,7 +392,7 @@ if(LEVELDB_BUILD_BENCHMARKS)
|
|
|
|
"${bench_file}"
|
|
)
|
|
- target_link_libraries("${bench_target_name}" leveldb gmock gtest)
|
|
+ target_link_libraries("${bench_target_name}" leveldb GTest::gtest)
|
|
target_compile_definitions("${bench_target_name}"
|
|
PRIVATE
|
|
${LEVELDB_PLATFORM_NAME}=1
|
|
--
|
|
2.30.2
|
|
|