Skip to content
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

Jump to bottom

[CXXModules] build rules; clhep modulemap; enable few cxxmodules #5795

Merged
merged 2 commits into from
May 2, 2020
Merged

[CXXModules] build rules; clhep modulemap; enable few cxxmodules #5795

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
c52b64d
[CXXModules] build rules; clhep modulemap; enable few cxxmodules
smuzaffar May 2, 2020
bfa2037
typo
smuzaffar May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions CXXModules.mk.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ CondFormatsPhysicsToolsObjects_CXXMODULES:=1
CondFormatsRecoMuonObjects_CXXMODULES:=1
CondFormatsRPCObjects_CXXMODULES:=1
CondFormatsSiPhase2TrackerObjects_CXXMODULES:=1
CondFormatsSiPixelObjects_CXXMODULES:=1
CondFormatsSiPixelObjects_CXXMODULES:=0
CondFormatsSerialization_CXXMODULES:=1
#------------- CondTools
CondToolsBTau_CXXMODULES:=0
Expand Down Expand Up @@ -212,7 +212,7 @@ DataFormatsV0Candidate_CXXMODULES:=1
###########################################################################
# Invalid declaration chain: clang::Redeclarable<clang::FunctionDecl>::redecl_iterator::operator++()
# (this will be fixed automatically when we upgrade llvm in root)
DataFormatsParticleFlowReco_CXXMODULES:=0
DataFormatsParticleFlowReco_CXXMODULES:=1
# Disabling module because of error: CondFormatsL1TObjects_xr dictionary forward declarations' payload:16:192: error: enumeration previously declared with nonfixed underlying type
# enum __attribute__((annotate("$clingAutoload$CondFormats/L1TObjects/interface/L1GtDefinitions.h"))) __attribute__((annotate("$clingAutoload$CondFormats/L1TObjects/interface/L1GtBoard.h"))) L1GtPsbQuad : unsigned int; ^
# ../src/CondFormats/L1TObjects/interface/L1GtDefinitions.h38:6: note: previous declaration is here
Expand Down Expand Up @@ -284,21 +284,21 @@ RecoTrackerTkTrackingRegions_CXXMODULES:=0
#------------- SimDataFormats
SimDataFormatsCaloHit_CXXMODULES:=0
SimDataFormatsDigiSimLinks_CXXMODULES:=0
SimDataFormatsEncodedEventId_CXXMODULES:=0
SimDataFormatsEncodedEventId_CXXMODULES:=1
SimDataFormatsForward_CXXMODULES:=0
SimDataFormatsGEMDigiSimLink_CXXMODULES:=0
SimDataFormatsGeneratorProducts_CXXMODULES:=0
SimDataFormatsGeneratorProducts_CXXMODULES:=1
SimDataFormatsHcalTestBeam_CXXMODULES:=0
SimDataFormatsHTXS_CXXMODULES:=0
SimDataFormatsPileupSummaryInfo_CXXMODULES:=0
SimDataFormatsRandomEngine_CXXMODULES:=0
SimDataFormatsRPCDigiSimLink_CXXMODULES:=0
SimDataFormatsTrackerDigiSimLink_CXXMODULES:=0
SimDataFormatsTrackingAnalysis_CXXMODULES:=0
SimDataFormatsTrackingAnalysis_CXXMODULES:=1
SimDataFormatsTrackingHit_CXXMODULES:=0
SimDataFormatsTrack_CXXMODULES:=0
SimDataFormatsTrack_CXXMODULES:=1
SimDataFormatsValidationFormats_CXXMODULES:=0
SimDataFormatsVertex_CXXMODULES:=0
SimDataFormatsVertex_CXXMODULES:=1
SimDataFormatsAssociations_CXXMODULES:=0
SimDataFormatsCaloAnalysis_CXXMODULES:=0
SimDataFormatsCaloTest_CXXMODULES:=0
Expand Down
4 changes: 3 additions & 1 deletion clhep.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
%define tag bf87ac557a7be3a8a2ead6b27fbbc89dd7ed4c0b
%define branch cms/v%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Source0: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Source1: modulemaps/clhep.modulemap

BuildRequires: cmake ninja

Expand All @@ -25,6 +26,7 @@ ninja -v %{makeprocesses} -l $(getconf _NPROCESSORS_ONLN)
%install
cd ../build
ninja install
cp %{_sourcedir}/clhep.modulemap %{i}/include/

case $(uname) in Darwin ) so=dylib ;; * ) so=so ;; esac
rm -f %i/lib/libCLHEP-[A-Z]*-%realversion.$so
Expand Down
6 changes: 6 additions & 0 deletions modulemaps/clhep.modulemap.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module clhep {
export *
requires cplusplus
umbrella "CLHEP"
module * { export *}
}
2 changes: 1 addition & 1 deletion scram-project-build.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Requires: glibc
%endif

%if "%{?configtag:set}" != "set"
%define configtag V05-09-27
%define configtag V05-09-28
%endif

%if "%{?cvssrc:set}" != "set"
Expand Down