Skip to content
Snippets Groups Projects

Add missing headers to installation directory

Merged Axel Puntke requested to merge apuntke/cbmroot:missingheaderfix into master
All threads resolved!

Here I add some missing headers to the installation directory and adjust some include paths such that it is possible to load them without having access to the build or source directory.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Dear @d.smith, @fweig, @f.uhlig, @v.friese, @p.-a.loizeau,

    you have been identified as code owner of at least one file which was changed with this merge request.

    Please check the changes and approve them or request changes.

  • requested review from @v.friese

  • Assigned to @v.friese based on the central CMake changes but could be that @d.smith is more suited for reviewing this

  • Axel Puntke added 7 commits

    added 7 commits

    Compare with previous version

  • Axel Puntke added 3 commits

    added 3 commits

    • e5216803 - Add missing headers to installation directory
    • fa8f6507 - Apply clang-format
    • c522e1cf - Merge branch 'missingheaderfix' of git.cbm.gsi.de:apuntke/cbmroot into missingheaderfix

    Compare with previous version

  • Axel Puntke added 6 commits

    added 6 commits

    Compare with previous version

  • Axel Puntke added 23 commits

    added 23 commits

    Compare with previous version

  • Axel Puntke resolved all threads

    resolved all threads

  • Axel Puntke added 23 commits

    added 23 commits

    Compare with previous version

  • Axel Puntke added 4 commits

    added 4 commits

    • 05191d25 - 1 commit from branch computing:master
    • c167f6a9 - Add missing headers to installation directory
    • 7985e2b3 - Apply clang-format
    • 1c17ac48 - Apply clang-format

    Compare with previous version

  • I think the rebase conflicts came partially through the reformating of the full reco by @se.gorbunov and/or through the QA MRs of @s.zharko

    Could one of you please have a look? It could be interesting to check if what @apuntke prepared here does not apply to more headers in the algo folder.
    (of course we can also start be fixing this one, merging it and then make a further one for more headers)

  • Axel Puntke added 218 commits

    added 218 commits

    Compare with previous version

  • Axel Puntke added 1 commit

    added 1 commit

    • 120773c0 - Add missing CbmKfTrackFitter.h header file to installation directory

    Compare with previous version

  • Axel Puntke resolved all threads

    resolved all threads

  • Axel Puntke added 5 commits

    added 5 commits

    • 1d87b758 - 1 commit from branch computing:master
    • 3b899497 - Add missing headers to installation directory
    • 2a3169fb - Apply clang-format
    • 0e8afb2a - Apply clang-format
    • f8257e40 - Add missing CbmKfTrackFitter.h header file to installation directory

    Compare with previous version

  • Sergey Gorbunov approved this merge request

    approved this merge request

  • Axel Puntke added 9 commits

    added 9 commits

    • f8257e40...591d99fa - 5 commits from branch computing:master
    • 6a966667 - Add missing headers to installation directory
    • bdb43068 - Apply clang-format
    • 2c8eccec - Apply clang-format
    • 9633a63d - Add missing CbmKfTrackFitter.h header file to installation directory

    Compare with previous version

  • Volker Friese approved this merge request

    approved this merge request

  • Florian Uhlig added 15 commits

    added 15 commits

    • 9633a63d...cd8be22e - 11 commits from branch computing:master
    • d2377e5c - Add missing headers to installation directory
    • 83b757b4 - Apply clang-format
    • 13291e02 - Apply clang-format
    • a8f53daf - Add missing CbmKfTrackFitter.h header file to installation directory

    Compare with previous version

  • Florian Uhlig resolved all threads

    resolved all threads

  • Florian Uhlig enabled an automatic merge when all merge checks for a8f53daf pass

    enabled an automatic merge when all merge checks for a8f53daf pass

  • Florian Uhlig canceled the automatic merge

    canceled the automatic merge

  • Florian Uhlig enabled an automatic merge when all merge checks for a8f53daf pass

    enabled an automatic merge when all merge checks for a8f53daf pass

  • mentioned in merge request !2048 (merged)

  • Pierre-Alain Loizeau canceled the automatic merge

    canceled the automatic merge

  • Pierre-Alain Loizeau enabled an automatic merge when all merge checks for a8f53daf pass

    enabled an automatic merge when all merge checks for a8f53daf pass

  • Sorry, cancelled the auto-merge of the wrong MR :sweat:

  • Pierre-Alain Loizeau aborted the automatic merge because target branch was updated

    aborted the automatic merge because target branch was updated

  • I will rebase and re-enable the auto-merge as soon as the real data job is done

  • added 6 commits

    • a8f53daf...7ce50394 - 2 commits from branch computing:master
    • 984957bf - Add missing headers to installation directory
    • 65360637 - Apply clang-format
    • f4ebef36 - Apply clang-format
    • 7db6494a - Add missing CbmKfTrackFitter.h header file to installation directory

    Compare with previous version

  • Pierre-Alain Loizeau enabled an automatic merge when all merge checks for 7db6494a pass

    enabled an automatic merge when all merge checks for 7db6494a pass

  • Please register or sign in to reply
    Loading