Skip to content

Commit

Permalink
Merge pull request #67 from petiaccja/project-fixes
Browse files Browse the repository at this point in the history
Project fixes
  • Loading branch information
petiaccja authored Jul 30, 2022
2 parents 8af0df1 + d647443 commit 831e52a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
os: [windows-latest, ubuntu-latest]
c_compiler: [gcc, clang, cl]
build_type: [Debug, Release]
cxx_standard: ["17", "20"]
include:
- c_compiler: gcc
cxx_compiler: g++
Expand All @@ -36,7 +37,7 @@ jobs:
- os: ubuntu-latest
c_compiler: cl

name: ${{ matrix.c_compiler }} - ${{ matrix.build_type }} - ${{ matrix.os }}
name: ${{ matrix.c_compiler }} - ${{ matrix.build_type }} - ${{ matrix.os }} - c++${{ matrix.cxx_standard }}

runs-on: ${{matrix.os}}

Expand All @@ -59,7 +60,7 @@ jobs:
env:
CC: ${{matrix.c_compiler}}
CXX: ${{matrix.cxx_compiler}}
run: cmake $GITHUB_WORKSPACE -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
run: cmake $GITHUB_WORKSPACE -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{ matrix.cxx_standard }}

- name: Build
working-directory: ${{runner.workspace}}/build
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Mathter CMake
## DSPBB CMake
project(DSPBB)

cmake_minimum_required(VERSION 3.15.0)
Expand All @@ -8,7 +8,6 @@ list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})

# Cpp flags
enable_language(CXX)
set(CMAKE_CXX_STANDARD 17)

option(ENABLE_LLVM_COV "Adds compiler flags to generate LLVM source-based code coverage. Only works with Clang." OFF)
option(ENABLE_LLVM_ADDRESS_SANITIZER "Adds compiler flags to generate LLVM source-based code coverage. Only works with Clang." OFF)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

![Language](https://img.shields.io/badge/Language-C++17-blue)
[![License](https://img.shields.io/badge/License-MIT-blue)](#license)
![Build](https://github.com/petiaccja/DSPBB/workflows/Build/badge.svg)
[![Build & test](https://github.com/petiaccja/DSPBB/actions/workflows/build_and_test.yml/badge.svg)](https://github.com/petiaccja/DSPBB/actions/workflows/build_and_test.yml)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=petiaccja_DSPBB&metric=alert_status)](https://sonarcloud.io/dashboard?id=petiaccja_DSPBB)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=petiaccja_DSPBB&metric=coverage)](https://sonarcloud.io/dashboard?id=petiaccja_DSPBB)

Expand Down
5 changes: 3 additions & 2 deletions include/dspbb/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Enumerate sources
add_library(DSPBB INTERFACE)

message("${CMAKE_CURRENT_SOURCE_DIR}/..")
Expand All @@ -7,4 +6,6 @@ target_include_directories(DSPBB INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/..")
find_package(xsimd REQUIRED)
find_package(Eigen3 REQUIRED)
target_link_libraries(DSPBB INTERFACE xsimd::xsimd)
target_link_libraries(DSPBB INTERFACE Eigen3::Eigen3)
target_link_libraries(DSPBB INTERFACE Eigen3::Eigen3)

target_compile_features(DSPBB INTERFACE cxx_std_17)
1 change: 0 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Enumerate sources
add_executable(UnitTest)

target_sources(UnitTest PRIVATE main.cpp)
Expand Down

0 comments on commit 831e52a

Please sign in to comment.