-
Notifications
You must be signed in to change notification settings - Fork 7.3k
[shaderc] Fix pkgconfig file generation #48996
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.
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
base: master
Are you sure you want to change the base?
Conversation
In our port, we apply a patch to the build to link against the `glslang` and `SPIRV-Tools` libraries. While the generated cmake config files reflect this change, the generated pkgconfig file did not. This change fixes that. Additionally, I also added in creation of a `shaderc` pkgconfig file in addition to the `shaderc_static` pkgconfig file when building statically. This change brings it in-line with how pkgconfig files are generated for other libraries (the static library has the same name as the shared library), and fixes scenarios where we may be building a static `shaderc` library but dynamic other libraries that depend on it.
IMO this sound quite confusing. At least in vcpkg, there should be one pkgconfig module name, regardless of triplet. |
To be clear, this is for an upcoming patch to ffmpeg to add in shaderc support; If we're building ffmpeg dynamically (and since One solution is that I can just remove the |
Co-authored-by: Kai Pastor <dg0yt@darc.de>
5dd2345 to
b60d8f2
Compare
9d396fd to
2223ca2
Compare
I think @dg0yt 's observation is exactly that there shouldn't be a |
BillyONeal
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the nitpick :/
Thanks!
| ) | ||
|
|
||
| vcpkg_cmake_install() | ||
| if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") | |
| if(NOT VCPKG_BUILD_TYPE) |
./vcpkg x-add-version --alland committing the result.In our port, we apply a patch to the build to link against the
glslangandSPIRV-Toolslibraries. While the generated cmake config files reflect this change, the generated pkgconfig file did not, resulting in errors when linking against this library with pkgconfig. This change fixes that.Additionally, I also added in creation of a
shadercpkgconfig file in addition to theshaderc_staticpkgconfig file when building statically. This change brings it in-line with how pkgconfig files are generated for other libraries: the static library has the same name as the shared library, and there is no pc generated for the DLL. This fixes scenarios where we may be building a staticshaderclibrary but dynamic other libraries that depend on it and won't pass in--staticto pkgconfig (which is likely to happen, sinceshadercis only built statically).