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] Modernize find modules and show less verbose output #10256

Merged
merged 5 commits into from Aug 10, 2016

Conversation

@fetzerch
Copy link
Member

commented Aug 7, 2016

Modernize Find Modules (according to guideline: https://cmake.org/cmake/help/latest/manual/cmake-developer.7.html#find-modules)

  • Don't trust pkg-config, use it as hint and ensure that the things it suggests exist.
  • Show versions
  • Don't cache things that shouldn't be cached

It also shows less verbose output when not building with VERBOSE=1.

In addition it fixes a warning due to breakpad being removed and an issue with depends on linux/rbpi that could lead to host files being picked up. (@wsnipex might want to check 2be1703).

Still todo:

  • use ffmpeg from depends and don't build a second time
  • fix FindMMAL

@fetzerch fetzerch force-pushed the fetzerch:cmake_modernize_find branch 3 times, most recently from 33f4a57 to fe230ba Aug 7, 2016

@wsnipex

This comment has been minimized.

Copy link
Member

commented Aug 9, 2016

looks good to me

@fetzerch fetzerch force-pushed the fetzerch:cmake_modernize_find branch from 7efdff2 to 9839a7a Aug 9, 2016

fetzerch added 3 commits Aug 4, 2016
[cmake] Less verbose output of Check*.cmake
Check*.cmake (CheckCXXSourceCompiles.cmake) produces a lot of output.
Turn this of if not configuring with -DVERBOSE=1.
[depends/rbpi] Prevent CMake from using /usr prefix
On the Raspberry Pi `use_sdk_path` and `use_toolchain` expands to empty
variables and `/usr` (and others) end up being used in
`CMAKE_FIND_ROOT_PATH` and `CMAKE_LIBRARY_PATH`.
Since the depends path has higher priority, this only affects
dependencies that were not found (but are used on other platforms).

This fixes warning messages such as:
-- Could NOT find PulseAudio: Found unsuitable version "1.1.0", but
required is at least "2.0.0" (found PULSEAUDIO_LIBRARY-NOTFOUND)
-- Could NOT find VAAPI: Found unsuitable version "0.32.0", but
required is at least "0.38.0" (found VAAPI_libva_LIBRARY-NOTFOUND)

@fetzerch fetzerch force-pushed the fetzerch:cmake_modernize_find branch from 9839a7a to 130c19a Aug 9, 2016

@fetzerch fetzerch removed the WIP label Aug 9, 2016

@fetzerch

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2016

Thx, will update the remaining changes in separate PRs. This PR now also fixes the Appveyor build.

Jenkins build this please

fetzerch added 2 commits Aug 5, 2016
[cmake/win32] PkgConfig in FindFFMPEG.cmake doesn't work on Windows
AppVeyor has PkgConfig installed which causes a problem in
FindFFMPEG.cmake.

@fetzerch fetzerch force-pushed the fetzerch:cmake_modernize_find branch from 130c19a to 4fa6175 Aug 10, 2016

@fetzerch fetzerch merged commit 8fc33da into xbmc:master Aug 10, 2016

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@fetzerch fetzerch deleted the fetzerch:cmake_modernize_find branch Aug 10, 2016

@MartijnKaijser MartijnKaijser added this to the Krypton 17.0-beta1 milestone Aug 10, 2016

@fetzerch

This comment has been minimized.

Copy link
Member Author

commented Aug 10, 2016

One thing I forgot:
@Fneufneu: If you get some errors or libs or dependencies not found when you run cmake on BSD, please ping me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.