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

Use CMake to perform installation, and RPM macros #413

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

bryce-carson
Copy link
Contributor

Hi Ben,

This PR updates the RPM spec file for the 4.1 release, adopts recommended RPM macros rather than hard-coding things (though that did appear robust in the past), and makes CMake capable of installing SLiMgui, slim, and eidos with desktop integration (which simplifies the role of RPM and makes the spec file more maintainable).

It didn't cross my mind until now, but the following should work beautifully and provide desktop integration on Linux platforms when building from source and should also be integrated into the manual's installation instructions:

cmake -D BUILD_SLIMGUI=ON
make
make install # This line, on Linux, will now *also* install Desktop integration files.

@bhaller
Copy link
Contributor

bhaller commented Dec 5, 2023

Looks good to me, thanks! I haven't looked at the manual changes you sent yet; I suppose the bit you mention above in your comment has been worked in with your edits.

@bhaller bhaller merged commit 0c5c98f into MesserLab:master Dec 5, 2023
13 of 16 checks passed
@bryce-carson
Copy link
Contributor Author

Looks good to me, thanks! I haven't looked at the manual changes you sent yet; I suppose the bit you mention above in your comment has been worked in with your edits.

Hi Ben,

It hasn't, actually. I sent my edits to you already, before I thought of it.

I will make the change now and re-send the edition, since that will probably be the easiest for both of us (it's easier for me than explaining where to make the edition, and easier for you too, I hope).

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