Skip to content

[minuit2] Fix Minuit 2 standalone build#14026

Merged
guitargeek merged 2 commits into
root-project:masterfrom
guitargeek:minuit2_standalone
Nov 13, 2023
Merged

[minuit2] Fix Minuit 2 standalone build#14026
guitargeek merged 2 commits into
root-project:masterfrom
guitargeek:minuit2_standalone

Conversation

@guitargeek

@guitargeek guitargeek commented Nov 7, 2023

Copy link
Copy Markdown
Contributor

Follow-up on two recent PRs that independently broke the standalone Minuit 2 built:

More detail in the commit description.

Addresses the following forum post:
https://root-forum.cern.ch/t/standalone-minuit2/57006

@phsft-bot

Copy link
Copy Markdown

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac12arm/cxx20, windows10/default
How to customize builds

@github-actions

github-actions Bot commented Nov 7, 2023

Copy link
Copy Markdown

Test Results

       11 files         11 suites   1d 15h 43m 17s ⏱️
  2 481 tests   2 480 ✔️     0 💤 1
26 220 runs  26 044 ✔️ 175 💤 1

For more details on these failures, see this check.

Results for commit 7ee7466.

♻️ This comment has been updated with latest results.

I recently introduced a `R__HAS_MINUIT2` macro when moving to Minuit 2
as the default.

Introducing this macro broke the standalone build of `mathcore`, because
`RConfig.h` was now required. This commit is avoiding that by using
cmake definitions instead.

Follows up on 6866a57.
Follows up on 8ce465c.

That commit introduced two months ago a copying of the
`ROOTConfig-version.cmake` file to the Minuit 2 standalone build dir.
However, this file is only available after building ROOT, as it's
generated from the `ROOTConfig-version.cmake.in` template. A ROOT build
should not be required for Minuit 2 standalone.

Therefore, this commit suggests a different way to get the ROOT version
number: by inspecting the header files from the ROOT source.
@phsft-bot

Copy link
Copy Markdown

Starting build on ROOT-performance-centos8-multicore/soversion, ROOT-ubuntu2204/nortcxxmod, ROOT-ubuntu2004/python3, mac12arm/cxx20, windows10/default
How to customize builds

@lmoneta lmoneta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!
Thank you Jonas for fixing this!

@guitargeek
guitargeek merged commit 27082fb into root-project:master Nov 13, 2023
@guitargeek
guitargeek deleted the minuit2_standalone branch November 13, 2023 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants