- Make benchmarks compile again

- Include benchmarks in GitHub build job - Remove unnecessary compiler options from build job
mkatliar · May 23, 2024 · 1cf19b0 · 1cf19b0
1 parent 785914c
commit 1cf19b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -48,9 +48,7 @@ jobs:
         cmake -B ${{github.workspace}}/build \
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
         -DCMAKE_CXX_COMPILER=clang++ \
-        -DCMAKE_CXX_FLAGS="-march=native -mfma -mavx -mavx2 -msse4 -fno-math-errno -ftemplate-backtrace-limit=0" \
-        -DCMAKE_CXX_FLAGS_RELEASE="-O3 -g -DNDEBUG -ffast-math" \
-        -DBLAST_WITH_BENCHMARK=OFF \
+        -DBLAST_WITH_BENCHMARK=ON \
         -DBLAST_WITH_TEST=ON
 
     - name: Build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,6 +18,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 include(CMakeToolsHelpers OPTIONAL)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_DEBUG_POSTFIX d)

diff --git a/bench/common/CMakeLists.txt b/bench/common/CMakeLists.txt
@@ -12,7 +12,6 @@ target_link_libraries(bench-blast-common
     PUBLIC benchmark::benchmark
 )
 
-
 target_compile_options(bench-blast-common
     PUBLIC "-mllvm" "-inline-threshold=1000"
 )