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

CMakeLists.txt: "lib" -> "${CMAKE_INSTALL_LIBDIR}" #7471

Closed
wants to merge 1 commit into from

Conversation

glebm
Copy link
Collaborator

@glebm glebm commented Oct 9, 2024

Refs #7470

@Espionage724 Can you please check if the resulting RPM package is correct?

@glebm glebm marked this pull request as draft October 9, 2024 09:02
@glebm
Copy link
Collaborator Author

glebm commented Oct 9, 2024

Checked myself, the above still installs to /usr/lib

cmake -S. -Bbuild-rel -DCMAKE_BUILD_TYPE=Release -DDISCORD_INTEGRATION=ON
cmake --build build-rel -j --target package && rpm -qlp build-rel/devilutionx-1.6.0-1.x86_64.rpm | \
 grep discord_game_sdk.so
/usr/lib/discord_game_sdk.so

@glebm
Copy link
Collaborator Author

glebm commented Oct 9, 2024

I'm guessing we're somehow supposed to tell the CPack RPM generator to use RPM's %{_libdir} macro

@glebm
Copy link
Collaborator Author

glebm commented Oct 9, 2024

I haven't figured out a way to do this.

@glebm glebm closed this Oct 9, 2024
@AJenbo AJenbo deleted the cmake-install-libdir branch October 9, 2024 21:13
@AJenbo
Copy link
Member

AJenbo commented Oct 9, 2024

Maybe an issue with CPack?

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