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

CMake: Avoid hard-wired /usr/local/share #1325

Merged
merged 1 commit into from
Sep 1, 2023

Conversation

gollux
Copy link
Contributor

@gollux gollux commented Aug 15, 2023

Instead of defining own CMAKE_INSTALL_SHAREDIR, use existing CMAKE_INSTALL_FULL_DATADIR.

This way, CMAKE_INSTALL_PREFIX is respected.

Copy link
Collaborator

@gszy gszy left a comment

Choose a reason for hiding this comment

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

Looks OK except an indentation issue.

src/stlink-gui/CMakeLists.txt Show resolved Hide resolved
Instead of defining own CMAKE_INSTALL_SHAREDIR, use existing
CMAKE_INSTALL_FULL_DATADIR.

This way, CMAKE_INSTALL_PREFIX is respected.
@Nightwalker-87
Copy link
Member

@gollux: Thanks for your contribution. The change looks fine to me.
However we should add a note in our tutorial on how to select a custom install path (e.g. link to https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html) to point users to it, in case they are not familiar with CMake.

@Nightwalker-87
Copy link
Member

I'll update the documentation afterwards.

@Nightwalker-87 Nightwalker-87 merged commit 0915ee9 into stlink-org:develop Sep 1, 2023
10 checks passed
@stlink-org stlink-org locked as resolved and limited conversation to collaborators Sep 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants