[CMake] Include GNUInstallDirs #4996
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
iCharlesHu
approved these changes
Jun 28, 2024
| @@ -134,6 +134,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") | |||
| "-I/usr/lib/swift") # dispatch | |||
| endif() | |||
|
|
|||
| include(GNUInstallDirs) | |||
There was a problem hiding this comment.
Just double check: it's okay to set it for all platforms (not just windows right?)
There was a problem hiding this comment.
Yep! Linux tests + toolchain builds pass with this change too - I suspect this would have also led to an issue on Linux with plutil not being installed since it too would be installed into the runtime directory, so it's likely not only safe but necessary there too
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 GNUInstallDirs module sets
CMAKE_INSTALL_BINDIRwhich is used on Windows as the destination for installed.dllfiles. This addresses issues that I saw when building a Windows toolchain where the.dllfiles were not installed into the toolchain previously, but with this change are correctly installed into the bin directory.