using geant4_core_deps instead of geant4_deps for non graphic modules

maureeungaro · maureeungaro · commit 6899b04cd532 · 2026-01-20T09:28:59.000-05:00
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -95,7 +95,7 @@ jobs:
           echo "Manual build finished."
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         env:
           LD_PRELOAD: ""        # suppress trace‑library warning
         with:
diff --git a/actions/meson.build b/actions/meson.build
@@ -15,5 +15,5 @@ LD += {
                           'run/gRunAction.h',
                           'run/gRun.h'
                       ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, qt6_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, qt6_deps, geant4_core_deps],
 }
diff --git a/dbselect/meson.build b/dbselect/meson.build
@@ -48,7 +48,7 @@ LD += {
     'headers' : headers,
     'moc_headers' : moc_headers,
     'qrc_examples_sources' : qrc_examples_sources,
-    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_core_deps],
     'geo_build' : geo_build,
     'examples' : examples
 }
diff --git a/eventDispenser/meson.build b/eventDispenser/meson.build
@@ -19,7 +19,7 @@ LD += {
         'eventDispenser_options.h',
         'eventDispenserConventions.h'
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_event_dispenser' : [example_source, [weight_file_option, '-n=1000', ]],
         'test_event_dispenser_verbose' : [example_source, [weight_file_option, '-n=1000'] + verbosities]
diff --git a/g4system/meson.build b/g4system/meson.build
@@ -35,7 +35,7 @@ LD += {
         'g4objectsFactories/cad/CADMesh.hh',
         'g4objectsFactories/cad/cadSystemFactory.h',
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps, assimp_dep],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps, assimp_dep],
     'additional_includes' : ['g4system', 'g4system/g4objectsFactories', 'g4system/g4objectsFactories/g4native', 'g4system/g4objectsFactories/cad'],
     'geo_build' : {
         'test_g4system_geo' : [files('examples/example.py')]
diff --git a/gbase/meson.build b/gbase/meson.build
@@ -12,7 +12,7 @@ LD += {
     'headers' : files(
         'gbase.h',
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
 
     'examples' : {
         'test_gbase' : [example_source, verbosity],
diff --git a/gboard/meson.build b/gboard/meson.build
@@ -36,7 +36,7 @@ LD += {
     'sources' : sources,
     'headers' : headers,
     'moc_headers' : moc_headers,
-    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_core_deps],
     'additional_includes' : ['gboard'],
     'examples' : examples
 }
diff --git a/gdata/meson.build b/gdata/meson.build
@@ -43,7 +43,7 @@ LD += {
         'frame/gFrameDataCollection.h'
     ),
     'additional_includes' : ['gdata', 'gdata/event', 'gdata/run'],
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_gdata_event' : [example_event_source, ''],
         'test_gdata_event_verbose' : [example_event_source, verbosities],
diff --git a/gdetector/meson.build b/gdetector/meson.build
@@ -31,7 +31,7 @@ LD += {
         'gdetectorConstruction.h',
         'gdetector_options.h'
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'geo_build' : {
         'test_detector_geo' : [files('examples/example.py')]
     },
diff --git a/gdynamicDigitization/meson.build b/gdynamicDigitization/meson.build
@@ -23,7 +23,7 @@ LD += {
         'ginternalDigitization.h',
         'greadoutSpecs.h'
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'plugins' : {
         'test_gdynamic_plugin' : [files('examples/gplugin_test_example.cc'), true],
     },
diff --git a/gfactory/meson.build b/gfactory/meson.build
@@ -15,7 +15,7 @@ LD += {
         'gfactory.h',
         'gfactory_options.h'
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'plugins' : {
         'test_dyn_factory1' : [files('examples/FordFactory.cc'), true],
         'test_dyn_factory2' : [files('examples/TeslaFactory.cc'), true],
diff --git a/gfields/meson.build b/gfields/meson.build
@@ -30,7 +30,7 @@ LD += {
         'gfieldmultipolesFactory' : multipoles_files,
     },
     'additional_includes' : ['gfields', 'gfields/gfieldFactories/multipoles'],
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_gfield_dipole' : [example_source, input_file],
         'test_gfield_dipole_verbose' : [example_source, input_file + verbosities],
diff --git a/ghit/meson.build b/ghit/meson.build
@@ -10,7 +10,7 @@ LD += {
         'ghit.h',
         'ghitConventions.h'
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_ghit' : [files('examples/ghit_example.cc'), ''],
         'test_ghit_verbose' : [files('examples/ghit_example.cc'), '-verbosity.gtouchable=2', '-debug.gtouchable=true']
diff --git a/glogging/meson.build b/glogging/meson.build
@@ -5,5 +5,5 @@ LD += {
         'glogger.h',
         'gbatch_session.h'
     ),
-    'dependencies' : [clhep_deps, geant4_deps],
+    'dependencies' : [clhep_deps, geant4_core_deps],
 }
diff --git a/goptions/meson.build b/goptions/meson.build
@@ -13,7 +13,7 @@ LD += {
         'gversion.h',
         'goptionsConventions.h'
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
 
     'examples' : {
         'test_goptions_definitions' : [files('examples/define_options.cc'), ''],
diff --git a/gparticle/meson.build b/gparticle/meson.build
@@ -21,7 +21,7 @@ LD += {
                           'gparticle_options.h',
                           'gparticleConventions.h'
                       ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_gparticle_single' : [example_source, single],
         'test_gparticle_double' : [example_source, double],
diff --git a/gphysics/meson.build b/gphysics/meson.build
@@ -17,7 +17,7 @@ LD += {
                           'gphysics_options.h',
                           'gphysicsConventions.h'
                       ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps], # expat needed because g4processes
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps], # expat needed because g4processes
     'examples' : {
         'test_gphysics' : [example_source, '' ],
         'test_gphysics_verbose' : [example_source, verbosities]
diff --git a/gsd/meson.build b/gsd/meson.build
@@ -7,5 +7,5 @@ LD += {
     'headers' : files(
                           'gsd.h'
                       ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
 }
diff --git a/gstreamer/meson.build b/gstreamer/meson.build
@@ -75,7 +75,7 @@ streamer_plugins = {
     'gstreamer_jlabsro_plugin' : jlab_sro_plugin_files,
 }
 
-streamer_dependencies = [yaml_cpp_dep, clhep_deps, geant4_deps]
+streamer_dependencies = [yaml_cpp_dep, clhep_deps, geant4_core_deps]
 additional_includes = ['gstreamer', 'gstreamer/factories/ASCII', 'gstreamer/factories/CSV', 'gstreamer/factories/JLABSRO']
 
 # Add ROOT bits if available
diff --git a/gsystem/meson.build b/gsystem/meson.build
@@ -54,7 +54,7 @@ LD += {
         'gsystemFactories/gdml/systemGdmlFactory.h',
         'gsystemFactories/sqlite/systemSqliteFactory.h',
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps, sqlite_dep],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps, sqlite_dep],
     'additional_includes' : ['gsystem',
                              'gsystem/gsystemFactories',
                              'gsystem/gsystemFactories/cad',
diff --git a/gtouchable/meson.build b/gtouchable/meson.build
@@ -21,7 +21,7 @@ LD += {
         'gtouchable_options.h'
 
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_gtouchable_example' : [example_source, ''],
         'test_gtouchable_example_verbose' : [example_source, verbosities]
diff --git a/gtranslationTable/meson.build b/gtranslationTable/meson.build
@@ -18,7 +18,7 @@ LD += {
         'gtranslationTable_options.h',
         'gtranslationTableConventions.h'
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_translation_table' : [example_source, ''],
         'test_translation_table_verbose' : [example_source, verbosities]
diff --git a/guts/meson.build b/guts/meson.build
@@ -10,7 +10,7 @@ LD += {
         'gutsConventions.h'
     ),
 
-    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, geant4_core_deps],
     'examples' : {
         'test_guts_string_vector_from_string' : [files('examples/string_vector_from_string.cc'), 'akasha enkil marius']
     }
diff --git a/meson/g4_pkgconfig.py b/meson/g4_pkgconfig.py
@@ -1,15 +1,18 @@
 #!/usr/bin/env python3
 """
-Generate pkg‑config (.pc) file for Geant4
+Generate pkg-config (.pc) file for Geant4
+
+Writes:
+  - geant4.pc        : full libs from geant4-config --libs (as before)
+  - geant4_core.pc   : libs with graphical/GUI/vis/X11/OpenGL/Qt removed
 
 Usage:
-    ./g4_pkgconfig.py <install‑prefix>
+    ./g4_pkgconfig.py <install-prefix>
 
 Example:
     ./g4_pkgconfig.py $GEMC
 """
 import subprocess
-import shutil
 import sys
 from pathlib import Path
 from typing import List, Optional
@@ -35,23 +38,77 @@ def run_config(command: str, option: str) -> str:
 
 def filter_unwanted_flags(flags: str) -> str:
 	"""Strip out Qt / CLHEP / XercesC / TreePlayer / -Wshadow flags."""
-	unwanted = {"Qt", "qt", "CLHEP", "clhep",
-				"xercesc", "XercesC", "TreePlayer", "-Wshadow"}
-	return " ".join(f for f in flags.split()
-					if not any(uw in f for uw in unwanted))
-
-def generate_pkgconfig(install_prefix: Path,
-					   config_cmd: str,
-					   output_filename: str,
-					   name: str,
-					   description: str,
-					   root_lbs: Optional[List[str]] = None) -> None:
+	unwanted = {
+		"Qt", "qt",
+		"CLHEP", "clhep",
+		"xercesc", "XercesC",
+		"TreePlayer",
+		"-Wshadow",
+	}
+	return " ".join(f for f in flags.split() if not any(uw in f for uw in unwanted))
+
+
+def filter_graphical_libs(flags: str) -> str:
+	"""
+    Remove graphical/GUI/visualization-related link flags from a libs string.
+
+    This aims to eliminate X11 / Xt / Xmu / Xext / Xcb / OpenGL / GLU / GLUT / Qt* /
+    and common Geant4 visualization libraries (G4OpenGL*, G4vis_* etc.) if they
+    appear explicitly.
+
+    Note: This filter is intentionally conservative; it removes tokens whose text
+    clearly indicates GUI/vis, and also removes absolute paths to corresponding
+    static/shared libs.
+    """
+	# Substrings that identify GUI/vis tokens (works for -lX11, /usr/lib/.../libX11.a, etc.)
+	gui_markers = (
+		# X11 family
+		"X11", "Xau", "Xdmcp", "Xext", "Xmu", "Xt", "xcb", "ICE", "SM",
+		# OpenGL family
+		"GLU", "glut", "OpenGL", "libGL", "-lGL", "GLX",
+		# Qt
+		"Qt5", "Qt6", "Qt",
+		# Geant4 visualization libs (common names)
+		"G4OpenGL", "G4RayTracer", "G4VRML", "G4GMocren", "G4vis",
+		"G4ToolsSG",
+	)
+
+	kept: List[str] = []
+	for tok in flags.split():
+		# Drop anything that obviously references GUI/vis
+		if any(m in tok for m in gui_markers):
+			continue
+
+		# Also drop common linker options that can appear adjacent to GUI/vis libs,
+		# but only when they are standalone tokens; keep everything else.
+		# (We intentionally do NOT remove -Wl,*, --start-group, etc.)
+		kept.append(tok)
+
+	return " ".join(kept)
+
+
+def generate_pkgconfig(
+		install_prefix: Path,
+		config_cmd: str,
+		output_filename: str,
+		name: str,
+		description: str,
+		libs_filter=None,
+) -> None:
 	"""Create <install_prefix>/lib/pkgconfig/<output_filename>."""
 	prefix = run_config(config_cmd, "--prefix")
-	libs = filter_unwanted_flags(run_config(config_cmd, "--libs"))
-	cflags = filter_unwanted_flags(run_config(config_cmd, "--cflags"))
+
+	libs_raw = run_config(config_cmd, "--libs")
+	cflags_raw = run_config(config_cmd, "--cflags")
 	version = run_config(config_cmd, "--version")
 
+	# Keep your existing filtering for cflags; libs can be optionally post-filtered.
+	cflags = filter_unwanted_flags(cflags_raw)
+	libs = filter_unwanted_flags(libs_raw)
+
+	if libs_filter is not None:
+		libs = libs_filter(libs)
+
 	pc_content = f"""\
 prefix={prefix}
 exec_prefix=${{prefix}}
@@ -75,13 +132,29 @@ def generate_pkgconfig(install_prefix: Path,
 if __name__ == "__main__":
 	# --- 1. parse argument ----------------------------------------------------
 	if len(sys.argv) != 2:
-		sys.exit(f"Usage: {sys.argv[0]} <install‑prefix>")
+		sys.exit(f"Usage: {sys.argv[0]} <install-prefix>")
 
 	install_dir = Path(sys.argv[1]).expanduser().resolve()
 	if not install_dir.exists():
 		print(f"Creating installation directory {install_dir}")
 		install_dir.mkdir(parents=True, exist_ok=True)
 
 	# --- 2. generate .pc files -----------------------------------------------
-	generate_pkgconfig(install_dir, "geant4-config",
-					   "geant4.pc", "Geant4", "Geant4 Simulation Toolkit")
+	# Full (as before)
+	generate_pkgconfig(
+		install_dir,
+		"geant4-config",
+		"geant4.pc",
+		"Geant4",
+		"Geant4 Simulation Toolkit",
+	)
+
+	# Core (no graphical libs)
+	generate_pkgconfig(
+		install_dir,
+		"geant4-config",
+		"geant4_core.pc",
+		"Geant4 Core",
+		"Geant4 Simulation Toolkit (core, no graphical/GUI libs)",
+		libs_filter=filter_graphical_libs,
+	)
diff --git a/meson/meson.build b/meson/meson.build
@@ -59,13 +59,15 @@ endif
 fs = import('fs')
 gemc_prefix = get_option('prefix')
 geant4_pc_path = gemc_prefix / 'lib/pkgconfig'
+geant4_core_pc = geant4_pc_path / 'geant4_core.pc'
 geant4_pc = geant4_pc_path / 'geant4.pc'
 g4_pkgconfig_script = meson.project_source_root() / 'meson/g4_pkgconfig.py'
-if not fs.exists(geant4_pc)
-    message('geant4.pc not found in ' + geant4_pc + ', running install script to install it in ' + gemc_prefix)
+if not fs.exists(geant4_pc) or not fs.exists(geant4_core_pc)
+    message('geant4.pc or geant4_core.pc  not found in ' + geant4_pc_path + ', running install script to install it in ' + gemc_prefix)
     run_command(g4_pkgconfig_script, gemc_prefix, check : true)
 endif
-geant4_dep = dependency('geant4', version : '>=11.3.2')
+geant4_dep      = dependency('geant4',      version: '>=11.3.2', method: 'pkg-config')
+geant4_core_dep = dependency('geant4_core', version: '>=11.3.2', method: 'pkg-config')
 
 # cmake template - but still not working
 #geant4_dep = dependency(
@@ -81,6 +83,7 @@ geant4_dep = dependency('geant4', version : '>=11.3.2')
 #)
 
 geant4_deps = [geant4_dep]
+geant4_core_deps = [geant4_core_dep]
 if sys == 'linux'
     # Only on Linux: pull in GLX/X11 stack for G4OpenGL(.a)
     geant4_deps += [
diff --git a/subprojects/assimp.wrap b/subprojects/assimp.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/assimp/assimp
-revision = v6.0.2
+revision = v6.0.3
 depth = 1
 method = cmake
 #diff_files = assimp/0001-disable-version-soversion.patch
diff --git a/utilities/meson.build b/utilities/meson.build
@@ -8,5 +8,5 @@ LD += {
         'gemcUtilities.h',
         'gemcConventions.h',
     ),
-    'dependencies' : [yaml_cpp_dep, clhep_deps, qt6_deps, geant4_deps],
+    'dependencies' : [yaml_cpp_dep, clhep_deps, qt6_deps, geant4_core_deps],
 }

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ LD += {`
`15`	`15`	`'run/gRunAction.h',`
`16`	`16`	`'run/gRun.h'`
`17`	`17`	`),`
`18`		`- 'dependencies' : [yaml_cpp_dep, clhep_deps, qt6_deps, geant4_deps],`
	`18`	`+ 'dependencies' : [yaml_cpp_dep, clhep_deps, qt6_deps, geant4_core_deps],`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ LD += {`
`48`	`48`	`'headers' : headers,`
`49`	`49`	`'moc_headers' : moc_headers,`
`50`	`50`	`'qrc_examples_sources' : qrc_examples_sources,`
`51`		`- 'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],`
	`51`	`+ 'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_core_deps],`
`52`	`52`	`'geo_build' : geo_build,`
`53`	`53`	`'examples' : examples`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ LD += {`
`36`	`36`	`'sources' : sources,`
`37`	`37`	`'headers' : headers,`
`38`	`38`	`'moc_headers' : moc_headers,`
`39`		`- 'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_deps],`
	`39`	`+ 'dependencies' : [yaml_cpp_dep, qt6_deps, clhep_deps, geant4_core_deps],`
`40`	`40`	`'additional_includes' : ['gboard'],`
`41`	`41`	`'examples' : examples`
`42`	`42`	`}`