Skip to content

ARROW-4609: [C++] Use google benchmark from toolchain #3681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xhochy wants to merge 1 commit into from
Closed

ARROW-4609: [C++] Use google benchmark from toolchain #3681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/conda_env_cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

# ARROW-4056: The conda-forge boost 1.69.0 seems to break the Parquet unit
# tests with Xcode 8.3. Root cause not yet determined
benchmark
boost-cpp=1.68.0
brotli
bzip2
Expand Down
4 changes: 2 additions & 2 deletions cpp/cmake_modules/FindGBenchmark.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
if( NOT "$ENV{GBENCHMARK_HOME}" STREQUAL "")
file( TO_CMAKE_PATH "$ENV{GBENCHMARK_HOME}" _native_path )
list( APPEND _gbenchmark_roots ${_native_path} )
elseif ( GBenchmark_HOME )
list( APPEND _gbenchmark_roots ${GBenchmark_HOME} )
elseif ( GBENCHMARK_HOME )
list( APPEND _gbenchmark_roots ${GBENCHMARK_HOME} )
endif()

# Try the parameterized roots, if they exist
Expand Down
7 changes: 6 additions & 1 deletion cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ if (NOT "$ENV{ARROW_BUILD_TOOLCHAIN}" STREQUAL "")
set(GFLAGS_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(GLOG_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(GRPC_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
set(GBENCHMARK_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
# Using gtest from the toolchain breaks AppVeyor and
# trusty builds
if (NOT MSVC)
Expand Down Expand Up @@ -107,6 +108,10 @@ if (DEFINED ENV{GRPC_HOME})
set(GRPC_HOME "$ENV{GRPC_HOME}")
endif()

if (DEFINED ENV{GBENCHMARK_HOME})
set(GBENCHMARK_HOME "$ENV{GBENCHMARK_HOME}")
endif()

if (DEFINED ENV{GTEST_HOME})
set(GTEST_HOME "$ENV{GTEST_HOME}")
endif()
Expand Down Expand Up @@ -761,7 +766,7 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
endif()

if(ARROW_BUILD_BENCHMARKS)
if("$ENV{GBENCHMARK_HOME}" STREQUAL "")
if("${GBENCHMARK_HOME}" STREQUAL "")
if(CMAKE_VERSION VERSION_LESS 3.6)
message(FATAL_ERROR "Building gbenchmark from source requires at least CMake 3.6")
endif()
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if(ARROW_BUILD_BENCHMARKS)
elseif(MSVC)
target_link_libraries(arrow_benchmark_main gbenchmark_static Shlwapi.lib)
else()
target_link_libraries(arrow_benchmark_main gbenchmark_static pthread)
target_link_libraries(arrow_benchmark_main gbenchmark_static Threads::Threads)
endif()

# TODO(wesm): Some benchmarks include gtest.h
Expand Down