Skip to content

Commit c30ebfe

Browse files
committed
remove the benchmark from the cmakelists and CI workflow for now, since the github CI runners seem to already build benchmark from source, but in an incompatible version
1 parent f6cfdbe commit c30ebfe

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

.github/workflows/cpp_ci.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ jobs:
1717
- name: Install C++ dependencies
1818
run: sudo apt update && sudo apt install -y build-essential cmake libgtest-dev # libbenchmark-dev
1919

20-
# 2025-05-12: Added to resolve a linker error about the compiler and benchmark having different LTO versions.
21-
# Hopefully this can be removed in the future.
22-
- name: Build Google Benchmark from source
23-
run: |
24-
git clone https://github.com/google/benchmark.git
25-
cd benchmark
26-
git clone https://github.com/google/googletest.git
27-
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release
28-
cmake --build build --target install
29-
3020
- name: Setup
3121
run: cmake -B out -S .
3222

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ add_executable(structured_zip deprecated/techniques/structured_program
1717

1818
# Locate GTest
1919
find_package(GTest REQUIRED)
20-
find_package(benchmark REQUIRED)
20+
# find_package(benchmark REQUIRED)
2121
include_directories(${GTEST_INCLUDE_DIRS})
2222

2323
# Link unit_tests with what we want to test and the GTest and pthread library
@@ -57,7 +57,7 @@ add_executable(unit_tests ${SOURCES}
5757
)
5858
target_link_libraries(unit_tests ${GTEST_LIBRARIES} pthread)
5959

60-
add_executable(benchmarks ${SOURCES}
61-
benchmark/reduce.benchmark.cpp
62-
)
63-
target_link_libraries(benchmarks benchmark::benchmark benchmark::benchmark_main)
60+
# add_executable(benchmarks ${SOURCES}
61+
# benchmark/reduce.benchmark.cpp
62+
# )
63+
# target_link_libraries(benchmarks benchmark::benchmark benchmark::benchmark_main)

0 commit comments

Comments
 (0)