Skip to content

Commit

Permalink
add gcc14 support to actions (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
TinyTinni authored Nov 8, 2024
1 parent 63d3181 commit 69e3a37
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
release:
types: [published]
push:
tags:
branches:
- main
- master
Expand All @@ -23,13 +22,13 @@ jobs:
strategy:
matrix:
os:
- ubuntu-latest
- ubuntu-24.04
#- macos-latest
#- windows-2022
compiler:
# you can specify the version after `-` like "llvm-15.0.2".
- llvm-18
#- gcc-14
- gcc-14
build_type:
- Release
include:
Expand All @@ -53,13 +52,17 @@ jobs:
${{ runner.os }}-${{ matrix.compiler }}
- name: Install dependencies (linux)
run: sudo apt update && sudo apt install ninja-build libopencv-dev libpoco-dev
if: matrix.os == 'ubuntu-latest'
run: |
sudo add-apt-repository universe
sudo apt-get update
sudo apt-get install ninja-build libopencv-dev libpoco-dev
if: contains(matrix.os, 'ubuntu' )

- name: Install dependencies (windows)
run: |
choco install opencv --version 4.10.0 -y --package-parameters '/InstallationPath:C:\opencv /Environment'
echo "C:\opencv\opencv\build\x64\vc16\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
if: matrix.os == 'windows-latest'
if: contains(matrix.os, 'windows' )

- name: Setup Cpp
uses: aminya/setup-cpp@v1
Expand Down
2 changes: 0 additions & 2 deletions src/chaos/BernoulliSequence.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ class BernoulliSequence : public Sequence
}
template <std::invocable<> Func> Fail &with(Func f, double weight = 1.0)
{
if (!f)
return *this;
exceptions.push_back(std::move(f));
weights.push_back(weight);
return *this;
Expand Down
5 changes: 4 additions & 1 deletion src/chaos/Sequence.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ class Sequence
virtual void checkIsOpen() = 0;
virtual void checkRetrieve() = 0;
virtual void checkGrab() = 0;
virtual ~Sequence() = default;
virtual ~Sequence();
};

// workaround for GCC14, othewise, it segfaults
inline Sequence::~Sequence() = default;
} // namespace FairyCam
1 change: 1 addition & 0 deletions tests/AnyCamera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <opencv2/videoio.hpp>

#include <filesystem>
#include <optional> //required by GCC14

import FairyCam;

Expand Down

0 comments on commit 69e3a37

Please sign in to comment.