Skip to content

Merge upstream master into cmake-modernisation branch

Rosen Matev requested to merge rmatev/Gaudi:cmake-modernisation-merge-Aug6 into cmake-modernisation

There were a few textual and semantic conflicts. Most notably:

  • ignored the changes from gaudi/Gaudi!1103 (merged) as it wasn't obvious how they translate to new cmake
  • ignored the changes related to Python 3 builds (GitLab CI, support for +py3 compiler suffix in BINARY_TAG)
  • made sure GAUDI_VERSION.h can be included as with old cmake.
  • fixed a missing and some misplaced test executable declaration in GaudiKernel/CMakeLists.txt
  • added a script and a CI job to check for unused sources (the new cmake requires explicit listing of each compilation unit)
  • fix lookup for executables ending with .exe in tests (before tests picked up wrong executables from LCG views)
Edited by Rosen Matev

Merge request reports