cmake: Use standard CMAKE_INSTALL_INCLUDEDIR
#347
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
Current code uses hard-coded `include` or `CMAKE_INSTALL_INCDIR` to specify included directories. It makes the installed target not work with Nix, which tries to split headers into a different package. `CMAKE_INSTALL_INCLUDEDIR` is CMake’s recommended standard for setting header location. It allows package maintainers like Nix to control the install destination by setting appropriate cache variables.
|
|
|
Good catch, I'm not sure why we weren't using that right, I definitely know and have used CMAKE_INSTALL_INCLUDEDIR. We do have to override it if we're packaging for an Android AAR file. |
rpavlik
approved these changes
Nov 16, 2022
|
Would you mind adding a changelog fragment in the changes/sdk directory named |
rpavlik
added
the
needs changelog fragment
KiruyaMomochi
changed the title
CMAKE_INSTALL_INCLUDEDIRCMAKE_INSTALL_INCLUDEDIR
|
Awesome, thanks! |
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.
Current code uses hard-coded
includeorCMAKE_INSTALL_INCDIRto specify included directories. It makes the installed target not work with Nix, which tries to split headers into a different package.https://github.com/NixOS/nixpkgs/blob/7cb6229334cecda7592a6df2a23a2d19549044f1/pkgs/build-support/setup-hooks/multiple-outputs.sh#L150-L165
CMAKE_INSTALL_INCLUDEDIRis CMake’s recommended standard for setting header location. It allows package maintainers like Nix to control the install destination by setting appropriate cache variables.https://github.com/NixOS/nixpkgs/blob/7cb6229334cecda7592a6df2a23a2d19549044f1/pkgs/development/tools/build-managers/cmake/setup-hook.sh#L91-L103