Skip to content
Failed

Changes

Summary

  1. Fix missing explicit instantiations in ORANGE CSB (#1124) (details)
  2. Workaround missing G4persistency target bug in Geant4 11.2 (#1122) (details)
  3. Add compile-time consistency check for Celeritas and Geant4 versions (#1123) (details)
  4. Address feedback (details)
Commit 6fc681a6f2832c7a42fdb96c73fab35551cb1087 by noreply
Fix missing explicit instantiations in ORANGE CSB (#1124)

The file was modified src/orange/orangeinp/ConvexSurfaceBuilder.cc (diff)
Commit 23ee7e05311b6de49a3251040f405d0f19a229fa by noreply
Workaround missing G4persistency target bug in Geant4 11.2 (#1122)

* Workaround missing G4persistency target bug in Geant4 11.2

Geant4 11.2 split the G4persistency target into subcomponents:

- G4mctruth
- G4geomtext
- G4gdml (optional, only if Geant4 built with GDML support)

and so projects use the direct CMake targets will fail to link
these versions. A bug fix will be made in Geant4 itself to address
this.

Workaround issue in Celeritas by translating request for "persistency"
target in celeritas_get_g4libs to appropriate underlying targets. Use
translation rather than creation of our own imported target to:

- avoid possible (albeit unlikely) clashes with other projects that
  might create the same target.
- Reduce dependence on use of Celeritas' FindGeant4 wrapper by downstream
  projects.

* Ignore request for G4tasking if G4 11.2+

* Simplify logic of Geant4 target checking

Check obvious case first, then the special cases for persistency
and tasking. Post-process list to remove duplicates to avoid
ld warnings observed on macOS.
The file was modified cmake/CeleritasUtils.cmake (diff)
Commit 8230b451319ebd7b53f580228798f0f76b2625ec by noreply
Add compile-time consistency check for Celeritas and Geant4 versions (#1123)

The file was modified src/geocel/GeantGeoUtils.cc (diff)
The file was modified src/orange/orangeinp/detail/InfixStringBuilder.hh (diff)