Skip to content

Commit 2270ac7

Browse files
author
Eddie
committed
Builds with update
1 parent 7b1fda3 commit 2270ac7

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

benchmark/CMakeLists.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
cmake_minimum_required (VERSION 2.6)
1+
cmake_minimum_required (VERSION 3.8)
22

3-
set(CMAKE_CXX_FLAGS "-std=c++17 -g3 -fno-unroll-loops")
3+
set(CMAKE_CXX_FLAGS "-fno-unroll-loops")
44

5-
set(CMAKE_BUILD_TYPE "Release")
5+
set(CMAKE_CXX_STANDARD 17)
6+
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
67

78
project(ZooBenchmark)
89

@@ -16,13 +17,17 @@ include_directories(
1617

1718
# build google benchmark (target: benchmark)
1819
# do not build tests of benchmarking lib
19-
# set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Suppressing benchmark's tests" FORCE)
20-
21-
# add_subdirectory(dependencies/google_benchmark)
22-
20+
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Suppressing benchmark's tests" FORCE)
21+
add_subdirectory(dependencies/google_benchmark)
2322

2423
add_executable(
2524
catch2Benchmark
2625
catch2BenchmarkMain.cpp catch2Functions.cpp egyptian.cpp
2726
RobinHood.benchmark.cpp
2827
)
28+
29+
add_executable(
30+
zoo-google-benchmark benchmark_main.cpp cfs.cpp cfs/cfs_utility.cpp
31+
)
32+
33+
target_link_libraries(zoo-google-benchmark benchmark::benchmark)

benchmark/benchmark_main.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include <benchmark/benchmark.h>
2+
3+
BENCHMARK_MAIN();

benchmark/cfs.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,3 @@ BENCHMARK(genLinearVector)->RangeMultiplier(10)->Range(RangeLow, RangeHigh)->Uni
311311
BENCHMARK(randomVector)->RangeMultiplier(10)->Range(RangeLow, RangeHigh)->Unit(benchmark::kMicrosecond);//->Complexity();
312312
BENCHMARK(sortSTLRandomVector)->RangeMultiplier(10)->Range(RangeLow, RangeHigh)->Unit(benchmark::kMicrosecond);//->Complexity();
313313
BENCHMARK(transformationToCFS)->RangeMultiplier(10)->Range(RangeLow, RangeHigh)->Unit(benchmark::kMicrosecond);//->Complexity();
314-
315-
BENCHMARK_MAIN();
316-
Submodule google_benchmark updated 180 files

0 commit comments

Comments
 (0)