[ci] [macOS] Fix hidapi include directories on macOS#669
Merged
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
This fixes a macOS build failure when hidapi is discovered via pkg-config from Homebrew.
Problem
On this machine, -I/opt/homebrew/Cellar/hidapi/0.15.0/include/hidapi returns an include path ending in include/hidapi.
The source includes headers as hidapi/hidapi.h, which means the compiler also needs the parent include directory.
Without that, latest main fails during compilation of hidapi-enabled sources such as HidEncoderManager.
Fix
When CMake discovers hidapi include directories, normalize them by keeping the original include dirs and additionally appending the parent directory when a discovered include dir itself ends in and contains hidapi.h.
This preserves existing behavior for other platforms and layouts while fixing the Homebrew case.
This solves issue #658.
Validation