From b550fc797d633ecc56c7f86d54aaacc960a0a0f1 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 19 Oct 2023 13:09:34 +0200 Subject: [PATCH 1/2] clhep: Build with c++17 i.e. default std used for building cmssw --- clhep.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clhep.spec b/clhep.spec index 19f45800df1..efba8170e0a 100644 --- a/clhep.spec +++ b/clhep.spec @@ -1,5 +1,5 @@ ### RPM external clhep 2.4.7.1 - +## INCLUDE cpp-standard %define tag bfc29493e1b4928b1e6b0dff5f754565bcfd4795 %define branch cms/v%{realversion} %define github_user cms-externals @@ -17,6 +17,7 @@ cd ../build cmake ../%{n}-%{realversion} \ -G Ninja \ + -DCMAKE_CXX_STANDARD:STRING="%{cms_cxx_standard}" \ -DCMAKE_INSTALL_PREFIX:PATH="%i" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo From 4cf8917ca2c7d7412aded5f589ecf82036ce5759 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 19 Oct 2023 21:45:47 +0200 Subject: [PATCH 2/2] use CLHEP_BUILD_CXXSTD to set cpp std --- clhep.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clhep.spec b/clhep.spec index efba8170e0a..a97a04b2c7e 100644 --- a/clhep.spec +++ b/clhep.spec @@ -17,7 +17,7 @@ cd ../build cmake ../%{n}-%{realversion} \ -G Ninja \ - -DCMAKE_CXX_STANDARD:STRING="%{cms_cxx_standard}" \ + -DCLHEP_BUILD_CXXSTD="-std=c++%{cms_cxx_standard}" \ -DCMAKE_INSTALL_PREFIX:PATH="%i" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo