Address comments: change include and add use JSON to xml. Add conifer…

… to Requires of cmssw-tool-conf
cms-sw · Oct 23, 2023 · 6ad2c6c · 6ad2c6c
1 parent 60cac4d
commit 6ad2c6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -17,6 +17,7 @@ Requires: bz2lib
 Requires: cepgen
 Requires: classlib
 Requires: clhep
+Requires: conifer
 Requires: coral
 Requires: cppunit
 Requires: cpu_features

diff --git a/scram-tools.file/tools/conifer/conifer.xml b/scram-tools.file/tools/conifer/conifer.xml
@@ -1,7 +1,8 @@
 <tool name="conifer" version="@TOOL_VERSION@">
   <client>
     <environment name="CONIFER_BASE" default="@TOOL_ROOT@"/>
-    <environment name="INCLUDE" default="$CONIFER_BASE/conifer/backends/cpp/include"/>
+    <environment name="INCLUDE" default="$CONIFER_BASE/include"/>
   </client>
+  <use name="json"/>
 </tool>