Skip to content
Snippets Groups Projects

Changes for LHCb super project builds

Merged Rosen Matev requested to merge rmatev/Gaudi:rm-merge-targets into master
  • Have project name in merge target names. This allows for super project builds to have separate merge targets for every project.
  • Merged rootmap depends on each dictionary library. This way we can depend on the merged rootmap target to get a complete runtime.
Edited by Rosen Matev

Merge request reports

Pipeline #3659286 passed

Pipeline passed for 0ec56008 on rmatev:rm-merge-targets

Approved by

Merged by Marco ClemencicMarco Clemencic 3 years ago (Mar 25, 2022 10:46am UTC)

Merge details

  • Changes merged into master with 4e3c643a.
  • Deleted the source branch.

Pipeline #3758837 passed

Pipeline passed for 4e3c643a on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • mentioned in commit lhcb/LHCb@e6c17582

  • Rosen Matev mentioned in merge request lhcb/LHCb!3428 (merged)

    mentioned in merge request lhcb/LHCb!3428 (merged)

  • Rosen Matev added 3 commits

    added 3 commits

    • a8314526 - Have project name in merge target names
    • b1c1d6a2 - Merged rootmap depends on each dictionary library
    • d2d8d6ba - Better messages for merge targets

    Compare with previous version

  • Rosen Matev resolved all threads

    resolved all threads

  • Rosen Matev
  • Rosen Matev marked this merge request as ready

    marked this merge request as ready

  • assigned to @clemenci

  • Edited by Software for LHCb
  • Rosen Matev added 1 commit

    added 1 commit

    • 0ec56008 - Change ENV_CMAKE_SOURCE_DIR -> ENV_PROJECT_SOURCE_DIR

    Compare with previous version

  • Marco Clemencic changed milestone to %v36r5

    changed milestone to %v36r5

  • Marco Clemencic resolved all threads

    resolved all threads

  • Marco Clemencic approved this merge request

    approved this merge request

  • Marco Clemencic mentioned in commit 4e3c643a

    mentioned in commit 4e3c643a

  • mentioned in merge request lhcb/LHCb!3474 (merged)

  • I didn't notice it at first, but this change caused problems in LHCb run2-patches builds (see lhcb/LHCb!3474 (merged)).

  • mentioned in commit lhcb/Brunel@781ee3dd

  • mentioned in merge request lhcb/Brunel!1200 (merged)

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading