Skip to content

GitLab

  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • athena athena
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Jira
    • Jira
  • Merge requests 136
    • Merge requests 136
  • Deployments
    • Deployments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Issue
    • Repository
  • Activity
  • Graph
  • Commits
Collapse sidebar
  • atlas
  • athenaathena
  • Merge requests
  • !24736

Merged
Created Jul 09, 2019 by Benjamin Morgan@bmorganDeveloper

Support building `master` with Geant4 10.6

  • Overview 2
  • Commits 1
  • Changes 12

From version 10.6, Geant4 no longer exports G4MULTITHREADED in the compiler flags as -DG4MULTITHREADED. This symbol must be the same between a build of Geant4 and any client application, so is instead exported into a configuration header included in the common G4Types.hh header.

Update components of Athena that rely on this symbol so that they explicitly #include G4Types.hh before using it.

InnerDetector has a private dependency on Geant4 headers added so that it picks up the needed header path.

This prepares Athena for tests/builds with the new version without affecting use of older versions of Geant4, as the inclusion of G4Types.hh does not affect the public or private API/ABI or add additional public dependencies.

Needed to support ATLASSIM-4217

Edited Jul 09, 2019 by Benjamin Morgan
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: geant4-106beta-fixes