Fix include CMAKE_INSTALL_INCLUDEDIR #111
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
WangWeiLin-MV
force-pushed
the
fix/cmake-install-include-dir
branch
from
22c8549
to
15fb1bc
Compare
xvitaly
approved these changes
Apr 29, 2024
|
Whoops, thank you! |
7 tasks
data-queue
pushed a commit
to microsoft/vcpkg
that referenced
this pull request
May 17, 2024
Fixes include `CMAKE_INSTALL_INCLUDEDIR` since target `scn::scn` lost `INTERFACE_INCLUDE_DIRECTORIES`, Fixed by backporting upstream patches in eliaskosunen/scnlib#111. Format and unify `EOL` to `LF` of `portfile.cmake`. ### Checklist - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version.~ - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. ### Test The port usage tests pass with the following triplets: * x64-linux * x64-windows
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.
The
target_include_directorieschanged from$<INSTALL_INTERFACE:include>to$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>in 8d6218a#diff, whileGNUInstallDirscmake/install.cmake#L5 has not yet been included, led targetscn::scnlostINTERFACE_INCLUDE_DIRECTORIES.Move the public include defineINSTALL_INTERFACEto fix it.Move
include(GNUInstallDirs)to fix it.