You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/01/05 01:38:37 UTC
[arrow] branch master updated: ARROW-1909: [C++] Enables building
with benchmarks on windows
This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new cb9c52e ARROW-1909: [C++] Enables building with benchmarks on windows
cb9c52e is described below
commit cb9c52e4b1d81446ddcfaf4485a8284006dc68d0
Author: Adam Seibert <se...@users.noreply.github.com>
AuthorDate: Thu Jan 4 20:38:32 2018 -0500
ARROW-1909: [C++] Enables building with benchmarks on windows
These changes were necessary to compile on Windows with "-DARROW_BUILD_BENCHMARKS=ON". I added Shwlapi based on https://github.com/google/benchmark/issues/202.
Author: Adam Seibert <se...@users.noreply.github.com>
Closes #1406 from seibs/ARROW-1909 and squashes the following commits:
98602cd0 [Adam Seibert] ARROW-1909: [C++] Enables building with benchmarks on windows
---
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 aa7d899..44df441 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 42613d6..a36dffb 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
--
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <co...@arrow.apache.org>'].