Skip to content

Commit 8378339

Browse files
committed
cons: Generate ROOT dictionary for generated geometry sources
Since this is done manually for the the generated classes (`StarGeometry` and `Geometry`), we need to turn off the automatic dictionary generation in `StarVMC/Geometry` triggered otherwise by the `StarGeoLinkDef.h` file.
1 parent 2107b8f commit 8378339

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

StarVMC/Geometry/StarGeoLinkDef.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifdef __CINT__
2+
#pragma link off all globals;
3+
#pragma link off all classes;
4+
#pragma link off all functions;
5+
6+
#pragma link C++ class StarGeometry;
7+
#pragma link C++ class Geometry;
8+
#endif

mgr/Conscript-standard

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,12 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
304304
}
305305
#print "\tAfter ".($#src)." ".($#inc)."\n";
306306

307+
if ($Dir =~ m#StarVMC/StarGeometry#) {
308+
Command $env ["$OBJ/StarVMC/StarGeometry/StarGeo_Cint.cxx", "$OBJ/StarVMC/StarGeometry/StarGeo_Cint.h"],
309+
("$OBJ/StarVMC/StarGeometry/StarGeo.h", "#StarVMC/Geometry/StarGeoLinkDef.h"), qq(rootcint -f %> -c %1 %2);
310+
push(@srcL, "$OBJ/StarVMC/StarGeometry/StarGeo_Cint.cxx");
311+
}
312+
307313
#print "-=-=-=-=- LALALA -=-=-=-\n";
308314
# 2018/01 issue after updating to AgML 2.0
309315
# TODO problem with optimization in xgeometry and StarGeometry
@@ -1118,7 +1124,7 @@ if ( $pkg !~ /^sim$/ && $pkg !~ /^gen$/ ) {
11181124
}
11191125
}
11201126

1121-
if ( $#Defs > -1 ){ # && ! $OnlinePackage ) {
1127+
if ( $#Defs > -1 && $pkg !~ m/Geometry/ ) {
11221128
my @CintFiles = ( $PKG . "_Cint.cxx", $PKG . "_Cint.h", "LinkDef.h" );
11231129

11241130
if ($env->{ENV}->{ROOT_VERSION_MAJOR} >= 6) {

0 commit comments

Comments
 (0)