Relax CUDACore and CUDADataFormats building to when 'cuda' is available

cms-sw · Sep 2, 2020 · 1d2cf86 · 1d2cf86
1 parent 2b5f2ae
commit 1d2cf86
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/CUDADataFormats/BeamSpot/BuildFile.xml b/CUDADataFormats/BeamSpot/BuildFile.xml
@@ -1,8 +1,10 @@
-<use name="rootcore"/>
-<use name="CUDADataFormats/Common"/>
-<use name="DataFormats/Common"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
+<iftool name="cuda"/>
+  <use name="rootcore"/>
+  <use name="CUDADataFormats/Common"/>
+  <use name="DataFormats/Common"/>
+  <use name="HeterogeneousCore/CUDAUtilities"/>
 
-<export>
+  <export>
     <lib name="1"/>
-</export>
+  </export>
+</iftool>
diff --git a/CUDADataFormats/Common/BuildFile.xml b/CUDADataFormats/Common/BuildFile.xml
@@ -1,4 +1,4 @@
-<iftool name="cuda-gcc-support">
+<iftool name="cuda">
   <use name="HeterogeneousCore/CUDAUtilities"/>
   <export>
     <lib name="1"/>

diff --git a/HeterogeneousCore/CUDACore/BuildFile.xml b/HeterogeneousCore/CUDACore/BuildFile.xml
@@ -1,4 +1,4 @@
-<iftool name="cuda-gcc-support">
+<iftool name="cuda">
   <use name="FWCore/Concurrency"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ServiceRegistry"/>

diff --git a/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml b/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
@@ -39,10 +39,12 @@
 <library file="OfflineToTransientBeamSpotESProducer.cc" name="OfflineToTransientBeamSpotESProducer">
   <flags EDM_PLUGIN="1"/>
 </library>
-<library file="BeamSpotToCUDA.cc" name="BeamSpotToCUDA">
-  <use name="cuda"/>
-  <use name="CUDADataFormats/BeamSpot"/>
-  <use name="HeterogeneousCore/CUDACore"/>
-  <use name="HeterogeneousCore/CUDAServices"/>
-  <flags EDM_PLUGIN="1"/>
-</library>
+<iftool name="cuda">
+  <library file="BeamSpotToCUDA.cc" name="BeamSpotToCUDA">
+    <use name="cuda"/>
+    <use name="CUDADataFormats/BeamSpot"/>
+    <use name="HeterogeneousCore/CUDACore"/>
+    <use name="HeterogeneousCore/CUDAServices"/>
+    <flags EDM_PLUGIN="1"/>
+  </library>
+</iftool>