From a2ee14d3fb623f6d2bb7f4ee553f6096b26bed8e Mon Sep 17 00:00:00 2001
From: Markus Pilman <markus.pilman@snowflake.com>
Date: Tue, 28 Jun 2022 10:23:38 -0600
Subject: [PATCH] fixed flowbench

---
 flowbench/CMakeLists.txt                      | 24 ++++---------------
 .../{ => include/flowbench}/GlobalData.h      |  0
 2 files changed, 4 insertions(+), 20 deletions(-)
 rename flowbench/{ => include/flowbench}/GlobalData.h (100%)

diff --git a/flowbench/CMakeLists.txt b/flowbench/CMakeLists.txt
index 8378c9c8ab..92870d992d 100644
--- a/flowbench/CMakeLists.txt
+++ b/flowbench/CMakeLists.txt
@@ -1,23 +1,7 @@
-set(FLOWBENCH_SRCS
-  flowbench.actor.cpp
-  BenchCallback.actor.cpp
-  BenchEncrypt.cpp
-  BenchHash.cpp
-  BenchIterate.cpp
-  BenchIONet2.actor.cpp
-  BenchMem.cpp
-  BenchMetadataCheck.cpp
-  BenchNet2.actor.cpp
-  BenchPopulate.cpp
-  BenchRandom.cpp
-  BenchRef.cpp
-  BenchStream.actor.cpp
-  BenchTimer.cpp
-  BenchVersionVector.cpp
-  GlobalData.h
-  GlobalData.cpp)
-
 project (flowbench)
+
+fdb_find_sources(FLOWBENCH_SRCS)
+
 # include the configurations from benchmark.cmake
 configure_file(benchmark.cmake googlebenchmark-download/CMakeLists.txt)
 # executing the configuration step
@@ -46,6 +30,6 @@ add_subdirectory(
   ${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-build
   EXCLUDE_FROM_ALL
 )
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-src/include)
 add_flow_target(EXECUTABLE NAME flowbench SRCS ${FLOWBENCH_SRCS})
+target_include_directories(flowbench PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include"  ${CMAKE_CURRENT_BINARY_DIR}/googlebenchmark-src/include)
 target_link_libraries(flowbench benchmark pthread flow fdbclient)
diff --git a/flowbench/GlobalData.h b/flowbench/include/flowbench/GlobalData.h
similarity index 100%
rename from flowbench/GlobalData.h
rename to flowbench/include/flowbench/GlobalData.h