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: Correct EXPORTED config install path #127

Merged
merged 1 commit into from
May 9, 2021

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented May 9, 2021

I was steered wrong, and set up the OpenShotAudioConfig.cmake file (and friends) to install to share/cmake/... that path is OK for arch-independent installs, but not for architecture-bound library installs like libopenshot-audio. Those should go into the same ${CMAKE_INSTALL_LIBDIR} that the libraries themselves go into, so that a multi-arch system can simultaneously have, e.g.:

  • /usr/lib/cmake/OpenShotAudio/OpenShotAudioConfig.cmake pointing to a 32-bit version
  • /usr/lib64/cmake/OpenShotAudio/OpenShotAudioConfig.cmake pointing to a 64-bit version

...and the right one will be used automatically.

Looking to merge this as soon as the CI is ready, because it has to be coordinated with a corresponding change to the Ubuntu PPA packaging control files (as they expect files to be installed into this path, by name).

@ferdnyc ferdnyc added the build Issues related to compiling or installing libopenshot-audio and its dependencies label May 9, 2021
@ferdnyc ferdnyc merged commit 92ff608 into OpenShot:develop May 9, 2021
@ferdnyc ferdnyc deleted the move-config branch May 9, 2021 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues related to compiling or installing libopenshot-audio and its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant