From e0f2ddea85f180cf5b11a9c682b27cd400ab2631 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sun, 20 Oct 2024 00:38:55 +0200 Subject: [PATCH] build: simplify folly benchmark build --- cmake/folly.cmake | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/cmake/folly.cmake b/cmake/folly.cmake index 4c17d79b..482fc209 100644 --- a/cmake/folly.cmake +++ b/cmake/folly.cmake @@ -131,7 +131,10 @@ if(WITH_BENCHMARKS) add_library(dwarfs_follybenchmark_lite OBJECT ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/Benchmark.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/Format.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/SharedMutex.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/Unicode.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/concurrency/CacheLocality.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/Futex.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/PerfScoped.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/StaticSingletonManager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/ext/test_ext.cpp @@ -160,7 +163,12 @@ if(WITH_BENCHMARKS) ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/logging/StandardLogHandlerFactory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/logging/StreamHandlerFactory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/logging/xlog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/memory/ReentrantAllocator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/synchronization/ParkingLot.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/synchronization/SanitizeThread.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/AtFork.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/Pid.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/ThreadId.cpp ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/testing/TestUtil.cpp ) if(NOT WIN32) @@ -173,15 +181,3 @@ if(WITH_BENCHMARKS) target_link_libraries(dwarfs_follybenchmark_lite PUBLIC dwarfs_folly_lite) endif() -if(WITH_BENCHMARKS) - target_sources(dwarfs_follybenchmark_lite PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/SharedMutex.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/concurrency/CacheLocality.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/detail/Futex.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/memory/ReentrantAllocator.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/synchronization/ParkingLot.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/synchronization/SanitizeThread.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/AtFork.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/folly/folly/system/ThreadId.cpp - ) -endif()