CMake pkg-config #1211
Merged
CMake pkg-config #1211
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
caspermeijn
force-pushed
the
cmake_pkg_config
branch
from
403c08c
to
60acaca
Compare
|
I have tested this in windows mingw and linux. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I changed the CMake files to use pkg-config to find the ffmpeg libraries. This simplified building QtAV for Android for me.
I also fixed the capi logic and changed the qmldir to lib/qml to match what KDE does (see
https://api.kde.org/ecm/kde-module/KDEInstallDirs.html#QMLDIR).
I tested this on Fedora 30 and Android.