Skip to content

sherpa: only use enable_or_disable in v3 series#41162

Merged
alalazo merged 1 commit intodevelopfrom
packages/sherpa-enable_or_disable
Nov 20, 2023
Merged

sherpa: only use enable_or_disable in v3 series#41162
alalazo merged 1 commit intodevelopfrom
packages/sherpa-enable_or_disable

Conversation

@wdconinc
Copy link
Copy Markdown
Contributor

The treatment of issue sherpa#348 with PR sherpa!497 was merged later than anticipated, not in time for the 2.2.13 series (or any 2.2.* release). The PR was merged into master, but is only in v3.0.0beta1. This bug prevents using sherpa with -hepmc3, -lhapdf, or -rivet (where -rivet is default; the others enabled by default) for all v2.2.* releases, and due to the if in spack, the workaround is only applied for versions up to 2.2.12 in spack. With this PR, the workaround is applied for all v2.2.* releases.

Tested that this PR causes 2.2.15 to compile Rivet support when +rivet, and not when -rivet. This does require cxxstd different from the default 11 (I used 14), since the Rivet headers include c++14 unique_ptr. Fixing that (specifying when which cxxstd is ok) will be for a different PR...

@iarspider
Copy link
Copy Markdown
Contributor

LGTM

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