[cmake] Properly find correct libcec version #10960
Merged
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
|
jenkins build this please |
wsnipex
reviewed
Nov 20, 2016
| PATHS ${PC_CEC_INCLUDEDIR}) | ||
|
|
||
| set(CEC_VERSION ${PC_CEC_VERSION}) | ||
| if(NOT PC_CEC_VERSION) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Just setting a pkgconfig minimum version doesn't work and just causes pkgconfig to not find an older package. But since our CMake modules don't trust package config and validate that the include directory really exists, it would still just find whatever version is installed. The proper way is to either call find_package with VERSION or set <Module Name>_FIND_VERSION inside the module. Additionally: If we don't have a version from package config, find it in the header file.
|
@wsnipex good to go then? |
|
this won't be the only such error if you didn't consider this aspect of the do-not-trust-pkgconfig change. just fyi, i had used the pkgconfig version check in more find modules originally. |
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.
Fix compile error if libcec 3.1 is installed.
Description
Just setting a pkgconfig minimum version doesn't work and just causes pkgconfig to not find an older package. But since our CMake modules don't trust package config and validate that the include directory
really exists, it would still just find whatever version is installed.
The proper way is to either call
find_packagewithVERSIONor set<Module Name>_FIND_VERSIONinside the module.Additionally: If we don't have a version from package config, the code now tries to find the version from the header file.
Motivation and Context
Fix.
How Has This Been Tested?
Compile tested on xenial (without build-deb ppa). Btw @wsnipex, will there gonna be a build-dep ppa for xenial?
Screenshots (if appropriate):
Types of change
Checklist: