Skip to content
Snippets Groups Projects

Merge upstream master into cmake-modernisation branch

1 unresolved thread

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

Pipeline #1853865 passed with warnings

Pipeline passed with warnings for c1ea57b7 on rmatev:cmake-modernisation-merge-Aug6

Approval is optional

Merged by Rosen MatevRosen Matev 4 years ago (Aug 8, 2020 4:07pm UTC)

Merge details

  • Changes merged into cmake-modernisation with 829a1a41.
  • Deleted the source branch.

Pipeline #1854998 passed with warnings

Pipeline passed with warnings for 829a1a41 on cmake-modernisation

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading