Skip to content

Commit

Permalink
[INFRA] Remove benchmark
Browse files Browse the repository at this point in the history
  • Loading branch information
eseiler committed Jan 29, 2024
1 parent e777012 commit 4aef199
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
make -j2 gtest_main benchmark_main yaml-cpp
make -j2 gtest_main yaml-cpp
- name: Build tests
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
cd build
cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DCMAKE_CXX_FLAGS="${{ matrix.cxx_flags }}"
make -j2 gtest_main benchmark_main yaml-cpp
make -j2 gtest_main yaml-cpp
- name: Build application
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
cd build
cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
-DCMAKE_CXX_FLAGS="${{ matrix.cxx_flags }}"
make -j3 gtest_main benchmark_main yaml-cpp
make -j3 gtest_main yaml-cpp
- name: Build application
run: |
Expand Down
10 changes: 0 additions & 10 deletions cmake/package-lock.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@ CPMDeclarePackage (seqan3
SYSTEM TRUE
OPTIONS "INSTALL_SEQAN3 OFF" "CMAKE_MESSAGE_LOG_LEVEL WARNING"
)
# benchmark
set (BENCHMARK_VERSION 1.8.3)
CPMDeclarePackage (benchmark
NAME benchmark
VERSION ${BENCHMARK_VERSION}
GITHUB_REPOSITORY google/benchmark
SYSTEM TRUE
OPTIONS "BENCHMARK_ENABLE_TESTING OFF" "BENCHMARK_ENABLE_WERROR OFF"
"CMAKE_MESSAGE_LOG_LEVEL WARNING"
)
# googletest
set (GOOGLETEST_VERSION 1.14.0)
CPMDeclarePackage (googletest
Expand Down
11 changes: 0 additions & 11 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
cmake_minimum_required (VERSION 3.16)

# CMake sometimes has trouble detecting pthreads on macOS, so we just assume a built-in pthreads.
if (APPLE)
set (CMAKE_THREAD_LIBS_INIT "-lpthread")
set (CMAKE_HAVE_THREADS_LIBRARY 1)
set (CMAKE_USE_WIN32_THREADS_INIT 0)
set (CMAKE_USE_PTHREADS_INIT 1)
set (THREADS_PREFER_PTHREAD_FLAG ON)
endif ()

CPMGetSystemPackage (benchmark)
CPMGetSystemPackage (googletest)
include (GoogleTest OPTIONAL)

Expand Down Expand Up @@ -45,7 +35,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
endif ()

target_link_libraries (${PROJECT_NAME}_test INTERFACE "${PROJECT_NAME}_lib" "GTest::gtest_main"
"benchmark::benchmark_main"
)
target_include_directories (${PROJECT_NAME}_test INTERFACE "${seqan3_SOURCE_DIR}/test/include")
add_library (${PROJECT_NAME}::test ALIAS ${PROJECT_NAME}_test)
Expand Down
6 changes: 0 additions & 6 deletions test/benchmark/README.md

This file was deleted.

5 changes: 3 additions & 2 deletions test/header/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ include (seqan3_test_component)

add_library ("${PROJECT_NAME}_header_test_lib" INTERFACE)
target_link_libraries ("${PROJECT_NAME}_header_test_lib" INTERFACE "${PROJECT_NAME}_test")
# SeqAn3 script adds an include for <bechmark/benchmark.h>
target_include_directories ("${PROJECT_NAME}_header_test_lib" INTERFACE ./dummy_include)
# SeqAn3 script adds an include for <benchmark/benchmark.h>
file (WRITE "${PROJECT_BINARY_DIR}/dummy_include/benchmark/benchmark.h" "#pragma once")
target_include_directories ("${PROJECT_NAME}_header_test_lib" INTERFACE "${PROJECT_BINARY_DIR}/dummy_include")
set (target "${PROJECT_NAME}_header_test")

set (header_base_path "${CMAKE_CURRENT_LIST_DIR}/../../include/")
Expand Down
1 change: 0 additions & 1 deletion test/header/dummy_include/benchmark/benchmark.h

This file was deleted.

0 comments on commit 4aef199

Please sign in to comment.