From 98602cd02c21c613be027d324d149c6a4d916d9d Mon Sep 17 00:00:00 2001 From: Adam Seibert Date: Sat, 9 Dec 2017 16:59:28 -0500 Subject: [PATCH] ARROW-1909: [C++] Enables building with benchmarks on windows Use int64 literal Change-Id: I96ab9edf10aebf2ea26170c90450e7341687e6d3 Revert int64->int because gbenchmark does not allow 64-bit integers in Args --- cpp/src/arrow/compute/compute-benchmark.cc | 2 +- cpp/src/arrow/util/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cpp/src/arrow/compute/compute-benchmark.cc b/cpp/src/arrow/compute/compute-benchmark.cc index aa7d899c864..44df441394a 100644 --- a/cpp/src/arrow/compute/compute-benchmark.cc +++ b/cpp/src/arrow/compute/compute-benchmark.cc @@ -191,7 +191,7 @@ static void BM_UniqueString100bytes(benchmark::State& state) { BENCHMARK(BM_BuildDictionary)->MinTime(1.0)->Unit(benchmark::kMicrosecond); BENCHMARK(BM_BuildStringDictionary)->MinTime(1.0)->Unit(benchmark::kMicrosecond); -constexpr int64_t kHashBenchmarkLength = 1 << 24; +constexpr int kHashBenchmarkLength = 1 << 24; #define ADD_HASH_ARGS(WHAT) \ WHAT->Args({kHashBenchmarkLength, 50}) \ diff --git a/cpp/src/arrow/util/CMakeLists.txt b/cpp/src/arrow/util/CMakeLists.txt index 42613d6a5f5..a36dffb52e2 100644 --- a/cpp/src/arrow/util/CMakeLists.txt +++ b/cpp/src/arrow/util/CMakeLists.txt @@ -57,6 +57,11 @@ if (ARROW_BUILD_BENCHMARKS) target_link_libraries(arrow_benchmark_main benchmark ) + elseif(MSVC) + target_link_libraries(arrow_benchmark_main + benchmark + Shlwapi.lib + ) else() target_link_libraries(arrow_benchmark_main benchmark