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.

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 FindCyclus.cmake #596

Merged
merged 3 commits into from
Apr 20, 2024
Merged

Update FindCyclus.cmake #596

merged 3 commits into from
Apr 20, 2024

Conversation

bennibbelink
Copy link
Contributor

A handful of changes to the CMake build in this PR.

  • As mentioned in #1737 we currently export LD_LIBRARY_PATH which helps the linker find all the libraries cycamore needs to link against. When cyclus is built with cython it builds three shared objects (eventhooks.so, pyinfile.so, and pymodule.so) that cycamore needs to be linked against. The current implementation of FindCyclus.cmake does not report these three libraries - this PR modifies FindCyclus.cmake to find them if they exist and ignores their lack of existence (in the case that cyclus was not built with python support).

  • A small change with how we handle the coin libraries. Should only be included in the build if the --allow-milps flag was set

  • Updates some outdated variables with respect to FindPython

Copy link

github-actions bot commented Apr 18, 2024

Build Status Report - 28997d1 - 2024-04-17 21:58:19 -0500

Build FROM cyclus_20.04_apt/cyclus:latest
  • Cycamore: Success
  • Cymetric: Success
Build FROM cyclus_20.04_apt/cyclus:stable
  • Cycamore: Failure
  • Cymetric: Skipped due to upstream failure ⚠️
Build FROM cyclus_20.04_conda/cyclus:latest
  • Cycamore: Success
  • Cymetric: Success
Build FROM cyclus_20.04_conda/cyclus:stable
  • Cycamore: Failure
  • Cymetric: Skipped due to upstream failure ⚠️
Build FROM cyclus_22.04_apt/cyclus:latest
  • Cycamore: Success
  • Cymetric: Success
Build FROM cyclus_22.04_apt/cyclus:stable
  • Cycamore: Failure
  • Cymetric: Skipped due to upstream failure ⚠️
Build FROM cyclus_22.04_conda/cyclus:latest
  • Cycamore: Success
  • Cymetric: Success
Build FROM cyclus_22.04_conda/cyclus:stable
  • Cycamore: Failure
  • Cymetric: Skipped due to upstream failure ⚠️

Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

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

This looks good to me - thanks @bennibbelink

@gonuke gonuke merged commit a351fd2 into cyclus:main Apr 20, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants