added expat dependency for relevant modules

maureeungaro · maureeungaro · commit 18d0e9cd43af · 2026-01-26T15:01:21.000-05:00
diff --git a/dbselect/meson.build b/dbselect/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'ghit', 'gdynamicDigitization', 'gsystem', 'gfactory',  'g4system', 'gtranslationTable', 'gsd', 'gdetector']
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'ghit', 'gdynamicDigitization', 'gsystem', 'gfactory',  'g4system', 'gtranslationTable', 'gsd', 'gdetector', 'gfields']
 
 with_gui = ['']
 if get_option('i_test')
diff --git a/gdetector/meson.build b/gdetector/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'ghit', 'gdynamicDigitization', 'gsystem', 'gfactory',  'g4system', 'gtranslationTable', 'gsd']
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'ghit', 'gdynamicDigitization', 'gsystem', 'gfactory',  'g4system', 'gtranslationTable', 'gsd', 'gfields']
 
 example_source = files('examples/gdetector_example.cc')
 verbosities = ['-verbosity.plugins=2',
@@ -33,7 +33,7 @@ LD += {
         'gdetector_options.h'
     ),
 
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps, expat_dep],
     'internal_dependencies' : internal_deps,
 
     'geo_build' : {
diff --git a/gdynamicDigitization/meson.build b/gdynamicDigitization/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'gtranslationTable', 'ghit', 'gfactory']
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'gdata', 'gtranslationTable', 'ghit', 'gfactory', 'gdata']
 
 example_source = files('examples/plugin_load_example.cc')
 verbosities = [
diff --git a/gparticle/meson.build b/gparticle/meson.build
@@ -22,7 +22,7 @@ LD += {
                           'gparticleConventions.h'
                       ),
 
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps, expat_dep, zlib_dep],
     'internal_dependencies' : internal_deps,
 
     'examples' : {
diff --git a/gphysics/meson.build b/gphysics/meson.build
@@ -18,7 +18,7 @@ LD += {
                           'gphysicsConventions.h'
                       ),
 
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps, expat_dep, zlib_dep],
     'internal_dependencies' : internal_deps,
 
     'examples' : {
diff --git a/gtree/meson.build b/gtree/meson.build
@@ -1,5 +1,5 @@
 sub_dir_name = meson.current_source_dir().split('/').get(-1)
-internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'g4system', 'gsystem', 'dbselect', 'gtranslationTable', 'gdetector', 'gdynamicDigitization', 'gfactory', 'gqtbuttonswidget']
+internal_deps = ['goptions', 'guts', 'glogging', 'gtouchable', 'g4system', 'gsystem', 'dbselect', 'gtranslationTable', 'gdetector', 'gdynamicDigitization', 'gfactory', 'gqtbuttonswidget', 'gdata', 'ghit', 'gfields', 'gsd']
 
 with_gui = ['']
 if get_option('i_test')
diff --git a/guts/gutilities.h b/guts/gutilities.h
@@ -368,8 +368,8 @@ inline std::filesystem::path gemc_root() {
 
     std::filesystem::path root;
 
-    // Case 1: executable came from .../bin
-    if (exe_dir.filename() == "bin") {
+    // Case 1: executable came from ../bin or (for tests) build
+    if (exe_dir.filename() == "bin" || exe_dir.filename() == "build") {
         root = exe_dir.parent_path();
     }
     else {
diff --git a/meson/meson.build b/meson/meson.build
@@ -27,6 +27,9 @@ clhep_deps = dependency('clhep',
                         version : '>=2.4.7.1',
                         include_type : 'system') # treat as system include paths - no warnings
 
+# expat required as geant4 is linked statically
+# Geant4’s GIDI/XML parsing in G4processes uses Expat
+expat_dep = dependency('expat', required: true)
 
 
 # feature: feature toggle (uncomment options() above)
@@ -93,11 +96,6 @@ if sys == 'linux'
         dependency('x11', required : true),
         dependency('xmu', required : true),
         dependency('gl', required : true),
-        dependency('expat', required : true),
-        zlib_dep
-    ]
-    geant4_core_deps += [
-        zlib_dep
     ]
 endif
 

Original file line number	Diff line number	Diff line change
`@@ -368,8 +368,8 @@ inline std::filesystem::path gemc_root() {`
`368`	`368`
`369`	`369`	`std::filesystem::path root;`
`370`	`370`
`371`		`- // Case 1: executable came from .../bin`
`372`		`- if (exe_dir.filename() == "bin") {`
	`371`	`+ // Case 1: executable came from ../bin or (for tests) build`
	`372`	`+ if (exe_dir.filename() == "bin" \|\| exe_dir.filename() == "build") {`
`373`	`373`	`root = exe_dir.parent_path();`
`374`	`374`	`}`
`375`	`375`	`else {`