Skip to content

Commit f0c647a

Browse files
Belle II SoftwareGiacomoXT
authored andcommitted
Merge branch 'bugfix/fix-libraries-after-cdc-dedx-move' into 'main'
Fix missing and extra libraries after moving CDC dEdx code from reconstruction to cdc package See merge request belle2/software/basf2!3997
1 parent eccfe97 commit f0c647a

File tree

12 files changed

+14
-13
lines changed

12 files changed

+14
-13
lines changed

alignment/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Import('env')
22

3-
env['LIBS'] = ['framework', 'cdc_dataobjects',
3+
env['LIBS'] = ['framework', 'cdc_dataobjects', 'cdc_dbobjects',
44
'genfit2', '$ROOT_LIBS', 'EG', 'svd', 'pxd',
55
'alignment_dataobjects', 'calibration', 'calibration_dataobjects',
66
'klm_dataobjects', 'klm_dbobjects', 'klm', 'cdc', 'alignment_dbobjects',

cdc/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Import('env')
22

3-
env['LIBS'] = ['framework', 'geometry', 'simulation', 'calibration', 'analysis',
3+
env['LIBS'] = ['framework', 'geometry', 'simulation', 'analysis', 'analysis_dataobjects',
44
'$ROOT_LIBS', 'Geom', 'EG', 'cdc_dataobjects', 'cdc_dbobjects',
55
'$GEANT4_LIBS', 'CLHEP', 'mdst_dataobjects', 'simulation_dataobjects', "boost_iostreams"]
66

cdc/calibration/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Import('env')
22

33
env['LIBS'] = ['tracking_trackFindingCDC','$ROOT_LIBS','Minuit', 'cdc', 'cdc_dataobjects', 'framework',
4-
'calibration', 'calibration_dataobjects']
4+
'calibration', 'calibration_dataobjects', 'cdc_dbobjects']
55
env['SUBLIB'] = True
66

77
Return('env')
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Import('env')
22

3-
env['LIBS'] = ['cdc_dataobjects', 'cdc', 'framework', 'mdst_dataobjects', '$ROOT_LIBS']
3+
env['LIBS'] = ['cdc_dataobjects', 'cdc', 'framework', 'mdst_dataobjects', '$ROOT_LIBS', 'cdc_dbobjects']
44

55
Return('env')

cdc/modules/cdcPacker/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Import('env')
2-
env['LIBS'] = ['rawdata_dataobjects', 'cdc_dataobjects', 'cdc_dbobjects', 'cdc', 'framework', '$ROOT_LIBS']
2+
env['LIBS'] = ['rawdata_dataobjects', 'cdc_dataobjects', 'cdc_dbobjects', 'framework', '$ROOT_LIBS']
33
Return('env')

cdc/modules/cdcUnpacker/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Import('env')
22

3-
env['LIBS'] = ['rawdata_dataobjects', 'cdc_dataobjects', 'cdc_dbobjects', 'cdc', 'framework', '$ROOT_LIBS', 'tracking_trackFindingCDC']
3+
env['LIBS'] = ['rawdata_dataobjects', 'cdc_dataobjects', 'cdc_dbobjects', 'framework', '$ROOT_LIBS', 'tracking_trackFindingCDC']
44

55
Return('env')

dqm/analysis/modules/SConscript

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ Import('env')
44

55
env['LIBS'] = ['framework', 'dqm',
66
'arich', 'cdc', 'dqm_dataobjects',
7+
'cdc_dataobjects', 'cdc_dbobjects',
78
'ecl', 'ecl_mapper',
89
'klm_dataobjects', 'klm_dbobjects',
9-
'svd_dataobjects', 'cdc_dataobjects',
10-
'vxd', 'vxd_dataobjects', 'cdc_dbobjects',
10+
'svd_dataobjects',
11+
'vxd', 'vxd_dataobjects',
1112
'RooFit', 'RooFitCore', 'ca', 'Com']
1213

1314
# this check is not completely save if new options are added with clang

hlt/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env['LIBS'] = [
99
"analysis_ClusterUtility",
1010
"analysis_VertexFitting",
1111
"mdst_dataobjects",
12-
'reconstruction_dataobjects',
12+
'cdc_dataobjects',
1313
'analysis_ContinuumSuppression',
1414
'analysis',
1515
'trg_cdc_dataobjects'

reconstruction/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Import('env')
2-
env['LIBS'] = ['$ROOT_LIBS', 'analysis', 'analysis_dataobjects', 'calibration', 'calibration_dataobjects', 'framework', 'reconstruction_dataobjects', 'reconstruction_dbobjects']
2+
env['LIBS'] = ['$ROOT_LIBS', 'analysis', 'analysis_dataobjects', 'framework', 'reconstruction_dataobjects']
33
Return('env')
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Import('env')
22

3-
env['LIBS'] = ['framework', 'cdc_dataobjects', '$ROOT_LIBS']
3+
env['LIBS'] = ['framework', '$ROOT_LIBS']
44

55
Return('env')

0 commit comments

Comments
 (0)