Skip to content

Added GeoModelCore and GeoModelIO packages and removed GeoModel

GeoModelKernel and GeoGenericFunctions are now contained in the GeoModelCore external package:

https://gitlab.cern.ch/GeoModelDev/GeoModelCore

This MR reflects these changes.

In this MR, I remove the old External/GeoModel package and I add the new packages External/GeoModelCore and External/GeoModelIO.

I also copied the old FindGeoModel.cmake file from External/GeoModel to the new External/GeoModelCore, to act as an alias for all the packages using find_package( GeoModel ) to load the GeoModel core libraries. Hence, Athena packages which want to use the GeoModel libs can now use find_package( GeoModel ) or find_package( GeoModelCore ) transparently.

I also updated to the new packages all projects which use GeoModel libraries.

I tested the new packages, and the removal of the old one, both compiling on master a bunch of Athena GeoModel-dependent packages (GeoModelUtilities, BeamPipeGeoModel, CavernInfraGeoModel, ...) and the full Athena project "VP1Light".


Pinging @akraszna for a potential better way to set aliases in CMake. Attila, what I'm using here, is having two copies of the same FindX.cmake: one for the name GeoModelCore, FindGeoModelCore.cmake, the other one for the alias GeoModel, FindGeoModel.cmake. But, of course, all suggestions about better CMake-ways to do that are more than welcome!


Cc: @tsulaia , @boudreau , @dellacqu , @emoyse

Edited by Riccardo Maria Bianchi

Merge request reports