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

Clean up BuildFiles under MagneticField/ #29687

Merged
merged 1 commit into from May 6, 2020
Merged

Clean up BuildFiles under MagneticField/ #29687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions MagneticField/Engine/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,5 @@
<use name="DataFormats/GeometryVector"/>
<use name="FWCore/Utilities"/>
<use name="DataFormats/GeometryVector"/>
<use name="FWCore/Utilities"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
23 changes: 12 additions & 11 deletions MagneticField/Engine/test/BuildFile.xml
View file
Open in desktop
@@ -1,13 +1,14 @@
<use name="boost"/>
<use name="clhep"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/Layers"/>
<use name="DataFormats/GeometryVector"/>
<library file="testMagneticField.cc" name="testMagneticField">
<flags EDM_PLUGIN="1"/>
<use name="MagneticField/VolumeBasedEngine"/>
<use name="boost"/>
<use name="clhep"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/Layers"/>
<use name="DataFormats/GeometryVector"/>
<library file="testMagneticField.cc" name="testMagneticField">
<flags EDM_PLUGIN="1"/>
<use name="MagneticField/VolumeBasedEngine"/>
</library>
<library file="queryField.cc" name="queryField">
<flags EDM_PLUGIN="1"/>

<library file="queryField.cc" name="queryField">
<flags EDM_PLUGIN="1"/>
</library>
24 changes: 12 additions & 12 deletions MagneticField/GeomBuilder/BuildFile.xml
View file
Open in desktop
@@ -1,14 +1,14 @@
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>
<use name="FWCore/Utilities"/>
<use name="MagneticField/Interpolation"/>
<use name="MagneticField/Layers"/>
<use name="MagneticField/VolumeGeometry"/>
<use name="Utilities/BinningTools"/>
<use name="CondFormats/MFObjects"/>
<use name="clhep"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>
<use name="FWCore/Utilities"/>
<use name="MagneticField/Interpolation"/>
<use name="MagneticField/Layers"/>
<use name="MagneticField/VolumeGeometry"/>
<use name="Utilities/BinningTools"/>
<use name="CondFormats/MFObjects"/>
<use name="clhep"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
17 changes: 8 additions & 9 deletions MagneticField/GeomBuilder/plugins/BuildFile.xml
View file
Open in desktop
@@ -1,12 +1,11 @@
<use name="MagneticField/GeomBuilder"/>
<use name="MagneticField/VolumeBasedEngine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/ParametrizedEngine"/>
<use name="CondFormats/RunInfo"/>
<use name="DetectorDescription/Parser"/>

<library file="*.cc" name="MagneticFieldGeomBuilderPlugins">
<flags EDM_PLUGIN="1"/>
<use name="MagneticField/GeomBuilder"/>
<use name="MagneticField/VolumeBasedEngine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/ParametrizedEngine"/>
<use name="CondFormats/RunInfo"/>
<use name="DetectorDescription/Parser"/>
<library file="*.cc" name="MagneticFieldGeomBuilderPlugins">
<flags EDM_PLUGIN="1"/>
</library>

<library name="DD4hep_MagneticFieldGeomBuilderPlugins" file="dd4hep/*.cc">
Expand Down
18 changes: 9 additions & 9 deletions MagneticField/GeomBuilder/test/BuildFile.xml
View file
Open in desktop
@@ -1,10 +1,10 @@
<library file="stubs/*.cc" name="testMagneticFieldGeomBuilder">
<use name="boost"/>
<use name="clhep"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/Interpolation"/>
<use name="MagneticField/VolumeBasedEngine"/>
<use name="CondFormats/MFObjects"/>
<flags EDM_PLUGIN="1"/>
<library file="stubs/*.cc" name="testMagneticFieldGeomBuilder">
<use name="boost"/>
<use name="clhep"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/Interpolation"/>
<use name="MagneticField/VolumeBasedEngine"/>
<use name="CondFormats/MFObjects"/>
<flags EDM_PLUGIN="1"/>
</library>
10 changes: 5 additions & 5 deletions MagneticField/Interpolation/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="MagneticField/VolumeGeometry"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="MagneticField/VolumeGeometry"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
<flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/>
<flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/>
26 changes: 15 additions & 11 deletions MagneticField/Interpolation/test/BuildFile.xml
View file
Open in desktop
@@ -1,18 +1,22 @@
<bin file="Grid1D_t.cpp">
<use name="MagneticField/Interpolation"/>
<bin file="Grid1D_t.cpp">
<use name="MagneticField/Interpolation"/>
<flags NO_TESTRUN="1"/>
</bin>
<bin file="Grid3D_t.cpp">
<use name="MagneticField/Interpolation"/>

<bin file="Grid3D_t.cpp">
<use name="MagneticField/Interpolation"/>
</bin>
<bin file="BinaryTablesGeneration/GridFileReader.cpp" name="GridFileReader">

<bin file="BinaryTablesGeneration/GridFileReader.cpp" name="GridFileReader">
<flags NO_TESTRUN="1"/>
<use name="clhep"/>
<use name="MagneticField/Interpolation"/>
<use name="clhep"/>
<use name="MagneticField/Interpolation"/>
</bin>
<bin file="BinaryTablesGeneration/prepareFieldTable.cpp, BinaryTablesGeneration/prepareMagneticFieldGrid.cc" name="prepareFieldTable">

<bin file="BinaryTablesGeneration/prepareFieldTable.cpp, BinaryTablesGeneration/prepareMagneticFieldGrid.cc" name="prepareFieldTable">
<flags NO_TESTRUN="1"/>
<use name="clhep"/>
<use name="MagneticField/Interpolation"/>
<use name="clhep"/>
<use name="MagneticField/Interpolation"/>
</bin>
<flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/>

<flags CXXFLAGS="-Wno-format -Wno-format-contains-nul"/>
6 changes: 3 additions & 3 deletions MagneticField/Layers/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,5 @@
<use name="boost"/>
<use name="MagneticField/VolumeGeometry"/>
<use name="boost"/>
<use name="MagneticField/VolumeGeometry"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
10 changes: 5 additions & 5 deletions MagneticField/ParametrizedEngine/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<use name="DataFormats/Math"/>
<use name="FWCore/ParameterSet"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/UniformEngine"/>
<use name="DataFormats/Math"/>
<use name="FWCore/ParameterSet"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/UniformEngine"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
16 changes: 8 additions & 8 deletions MagneticField/ParametrizedEngine/plugins/BuildFile.xml
View file
Open in desktop
@@ -1,9 +1,9 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/ParametrizedEngine"/>
<use name="CondFormats/RunInfo"/>
<library file="*.cc" name="MagneticFieldParametrizedEnginePlugins">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<use name="MagneticField/ParametrizedEngine"/>
<use name="CondFormats/RunInfo"/>
<library file="*.cc" name="MagneticFieldParametrizedEnginePlugins">
<flags EDM_PLUGIN="1"/>
</library>
8 changes: 4 additions & 4 deletions MagneticField/Records/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<use name="FWCore/Framework"/>
<use name="CondFormats/DataRecord"/>
<use name="boost"/>
<use name="FWCore/Framework"/>
<use name="CondFormats/DataRecord"/>
<use name="boost"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
2 changes: 1 addition & 1 deletion MagneticField/UniformEngine/BuildFile.xml
View file
Open in desktop
@@ -1 +1 @@
<use name="MagneticField/Engine"/>
<use name="MagneticField/Engine"/>
12 changes: 6 additions & 6 deletions MagneticField/UniformEngine/plugins/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,7 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<library file="UniformMagneticFieldESProducer.cc">
<flags EDM_PLUGIN="1"/>
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Records"/>
<library file="UniformMagneticFieldESProducer.cc">
<flags EDM_PLUGIN="1"/>
</library>
12 changes: 6 additions & 6 deletions MagneticField/VolumeBasedEngine/BuildFile.xml
View file
Open in desktop
@@ -1,8 +1,8 @@
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Layers"/>
<use name="MagneticField/VolumeGeometry"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="MagneticField/Engine"/>
<use name="MagneticField/Layers"/>
<use name="MagneticField/VolumeGeometry"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>
8 changes: 4 additions & 4 deletions MagneticField/VolumeGeometry/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="MagneticField/Engine"/>
<use name="DataFormats/GeometrySurface"/>
<use name="DataFormats/GeometryVector"/>
<use name="MagneticField/Engine"/>
<export>
<lib name="1"/>
<lib name="1"/>
</export>