Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FindPythia6.cmake #63

Closed
wants to merge 2 commits into from
Closed

Update FindPythia6.cmake #63

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f033bc4
Update FindPythia6.cmake
andriish Nov 29, 2023
65a9b69
Update FindPythia6.cmake
andriish Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmake/Modules/FindPythia6.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@
# Defines:
# PYTHIA6_FOUND
# PYTHIA6_LIBRARIES
set(TEST_PYTHIA6_ROOT_DIR "" ${PYTHIA6_ROOT_DIR})
IF(TEST_PYTHIA6_ROOT_DIR STREQUAL "")
IF(DEFINED ENV{PYTHIA6_ROOT_DIR})
set(PYTHIA6_ROOT_DIR $ENV{PYTHIA6_ROOT_DIR})
else()
set(PYTHIA6_ROOT_DIR "/usr")
endif()
endif()

find_library(PYTHIA6_LIBRARY NAMES Pythia6 pythia6-$ENV{PYTHIA6_VERSION}
HINTS $ENV{PYTHIA6} $ENV{PYTHIA6}/lib)
find_library(PYTHIA6_LIBRARY NAMES Pythia6 pythia6 pythia6-$ENV{PYTHIA6_VERSION}
HINTS $ENV{PYTHIA6} $ENV{PYTHIA6}/lib $ENV{PYTHIA6}/lib64 ${PYTHIA8_ROOT_DIR}/lib ${PYTHIA8_ROOT_DIR}/lib64)
Copy link
Member

Choose a reason for hiding this comment

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

Should that be PYTHIA6 rather than PYTHIA8 in the last two variables?

Copy link
Author

Choose a reason for hiding this comment

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

Hi @drbenmorgan, that was a very first PR to lay a fundament to switch examples from hepMC2 to HEpMC3.
Practically I can continue if you have some time.

Copy link
Member

Choose a reason for hiding this comment

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

Thanks @andriish, this all looks good now so I'll patch it in upstream and close things here when it's merged.

I do have some time to look at the HepMC2->3 switch (I guess that's the changes in #18?) so if you want to revive/rebase that, I can take a look.

Copy link
Author

Choose a reason for hiding this comment

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

Hi @drbenmorgan,
well, one would have to split #45 or #18 into smaller PRs:

  • Some CI for github to understand the things are working
  • Improvements for the Pythia6/Pythia8/LHAPDF - this is the most important part.
  • The update of the examples

Andrii

Copy link
Member

Choose a reason for hiding this comment

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

That makes sense - perhaps get the Pythia6/8/LHAPDF/HepMC3 cmake modules done first, then the examples? Sorry I hadn't spotted the CI add in #45 as well - that would be welcome but I think is best addressed in isolation and also with @gcosmo.

Copy link
Author

Choose a reason for hiding this comment

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

Hi @drbenmorgan,

  • CI -- see Add Actions CI with custom development container and compilation caching #67. That is quite a solid and fast solution.
  • cmake modules for Pythia6/8/LHAPDF can be added within minutes, HepMC3 provides a config for cmake, so no module is needed. But this makes sense to do after the CI.
  • The examples themselves should come either togather with cmake modules or later, separately.

Amdrii


set(PYTHIA6_LIBRARIES ${PYTHIA6_LIBRARY})
#message(STATUS PYTHIA6_LIBRARIES ${PYTHIA6_LIBRARIES} )
Expand Down