Skip to content

Change c++ standard to c++23 #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SiskaPavel merged 2 commits into from
Oct 1, 2025
Merged

Change c++ standard to c++23 #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4597d14
CMake - Change c++ standard to c++23
Sep 30, 2025
f120286
Spec: Update gcc-c++ dependency for C++23
Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS ON)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS ON)

Expand Down
9 changes: 2 additions & 7 deletions pkg/rpm/ipfixprobe-msec.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,12 @@ Conflicts: ipfixprobe-nemea, ipfixprobe
Source0: %{name}-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
%if 0%{?rhel} == 8
%if 0%{?rhel} < 10
BuildRequires: gcc-toolset-14
BuildRequires: gcc-toolset-14-gcc
BuildRequires: gcc-toolset-14-gcc-c++
%endif

%if 0%{?rhel} >= 9
BuildRequires: gcc >= 10
BuildRequires: gcc-c++ >= 10
%endif

BuildRequires: make
BuildRequires: cmake >= 3.12
BuildRequires: libunwind-devel
Expand Down Expand Up @@ -57,7 +52,7 @@ Export timestamp in milliseconds.
%autosetup

%build
%if 0%{?rhel} == 8
%if 0%{?rhel} < 10
source /opt/rh/gcc-toolset-14/enable
%endif
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_MILLISECONDS_TIMESTAMP=ON
Expand Down
9 changes: 2 additions & 7 deletions pkg/rpm/ipfixprobe-nemea.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,12 @@ Conflicts: ipfixprobe, ipfixprobe-msec, ipfixprobe-process-experimental
Source0: %{name}-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
%if 0%{?rhel} == 8
%if 0%{?rhel} < 10
BuildRequires: gcc-toolset-14
BuildRequires: gcc-toolset-14-gcc
BuildRequires: gcc-toolset-14-gcc-c++
%endif

%if 0%{?rhel} >= 9
BuildRequires: gcc >= 10
BuildRequires: gcc-c++ >= 10
%endif

BuildRequires: make
BuildRequires: cmake >= 3.12
BuildRequires: libunwind-devel
Expand Down Expand Up @@ -80,7 +75,7 @@ Experimental process plugins.
%autosetup

%build
%if 0%{?rhel} == 8
%if 0%{?rhel} < 10
source /opt/rh/gcc-toolset-14/enable
%endif
%cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_NEMEA=ON %{?with_output_unirec: -DENABLE_OUTPUT_UNIREC=ON} %{?with_process_experimental: -DENABLE_PROCESS_EXPERIMENTAL=ON}
Expand Down
9 changes: 2 additions & 7 deletions pkg/rpm/ipfixprobe.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,12 @@ Conflicts: ipfixprobe-nemea, ipfixprobe-msec
Source0: %{name}-%{version}.tar.gz

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
%if 0%{?rhel} == 8
%if 0%{?rhel} < 10
BuildRequires: gcc-toolset-14
BuildRequires: gcc-toolset-14-gcc
BuildRequires: gcc-toolset-14-gcc-c++
%endif

%if 0%{?rhel} >= 9
BuildRequires: gcc >= 10
BuildRequires: gcc-c++ >= 10
%endif

BuildRequires: make
BuildRequires: cmake >= 3.12
BuildRequires: libunwind-devel
Expand Down Expand Up @@ -101,7 +96,7 @@ Experimental process plugins.
%autosetup

%build
%if 0%{?rhel} == 8
%if 0%{?rhel} < 10
source /opt/rh/gcc-toolset-14/enable
%endif
%cmake -DCMAKE_BUILD_TYPE=Release %{?with_input_pcap:-DENABLE_INPUT_PCAP=ON} %{?with_input_dpdk:-DENABLE_INPUT_DPDK=ON} %{?with_input_nfb:-DENABLE_INPUT_NFB=ON} %{?with_process_experimental: -DENABLE_PROCESS_EXPERIMENTAL=ON}
Expand Down