Skip to content

[CMake] Include GNUInstallDirs #4996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2024
Merged

[CMake] Include GNUInstallDirs #4996

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
"-I/usr/lib/swift") # dispatch
endif()

include(GNUInstallDirs)
Copy link
Contributor

@iCharlesHu iCharlesHu Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just double check: it's okay to set it for all platforms (not just windows right?)

Copy link
Contributor Author

@jmschonfeld jmschonfeld Jun 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

include(FoundationSwiftSupport)

add_subdirectory(Sources)
Expand Down