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: Switch to GNUInstallDirs #742

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Conversation

jdemel
Copy link
Contributor

@jdemel jdemel commented Jan 12, 2024

The custom code to determine lib vs lib64 folder names on different distros was error prone. There's a better tool for that. Let's use it and potentially fix more issues that arise.

Fixes #723

The custom code to determine `lib` vs `lib64` folder names on different
distros was error prone. There's a better tool for that. Let's use it
and potentially fix more issues that arise.

Signed-off-by: Johannes Demel <[email protected]>
@argilo
Copy link
Member

argilo commented Jan 12, 2024

I tested this with PyBOMBS and it works fine there.

@jdemel
Copy link
Contributor Author

jdemel commented Jan 12, 2024

All tests pass. It's a little change. Let's merge it.

@jdemel jdemel merged commit 3b710d1 into gnuradio:main Jan 12, 2024
33 checks passed
@fventuri
Copy link

I just cloned the 'main' branch, built, and installed volk here on Fedora Core, and this time the shared libraries and related files get correctly installed in the right place ('/usr/local/lib64'):

-- Installing: /usr/local/lib64/cmake/volk/VolkConfig.cmake
-- Installing: /usr/local/lib64/cmake/volk/VolkConfigVersion.cmake
-- Installing: /usr/local/lib64/cmake/volk/VolkTargets.cmake
-- Installing: /usr/local/lib64/cmake/volk/VolkTargets-release.cmake
-- Installing: /usr/local/lib64/libvolk.so.3.1.0
-- Up-to-date: /usr/local/lib64/libvolk.so.3.1
-- Up-to-date: /usr/local/lib64/libvolk.so

Thanks for fixing it!
Franco

@jdemel jdemel deleted the use-gnuinstalldirs branch January 29, 2024 21:31
Alesha72003 pushed a commit to Alesha72003/volk that referenced this pull request May 15, 2024
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.

volk CMakeLists.txt uses CMAKE_INSTALL_LIBDIR without including the 'GNUInstallDirs' module
3 participants