[shaderc, spirv-tools] Fix cmake config, add usage, minor fixes #31912
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
The port never installed this lib's headers.
7 tasks
dg0yt
changed the title
dg0yt
commented
Jun 9, 2023
Comment on lines
+9
to
+15
| + set(sgcf_find_extra "") | ||
| + if(NOT "${TARGET}" STREQUAL "SPIRV-Tools-opt") | ||
| + set(sgcf_find_extra "find_dependency(SPIRV-Tools-opt)\n") | ||
| + endif() | ||
| file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake | ||
| "include(CMakeFindDependencyMacro)\n" | ||
| + ${sgcf_find_extra} |
There was a problem hiding this comment.
Fixes #31907 (comment).
| -DSPIRV_SKIP_TESTS=ON | ||
| -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} |
There was a problem hiding this comment.
This was overridden 3 lines later.
Comment on lines
-83
to
-86
| if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
| # lesspipe.sh is the only file there | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") | ||
| endif() |
There was a problem hiding this comment.
This didn't only remove spirv-lesspipe.sh, but also the SPIRV-Tools-shared.dll installed in static builds, while leaving the import lib SPIRV-Tools-shared.lib untouched.
Comment on lines
+29
to
+32
| + if(NOT BUILD_SHARED_LIBS) | ||
| + set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES EXCLUDE_FROM_ALL 1) | ||
| + list(REMOVE_ITEM SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared) | ||
| + endif() |
There was a problem hiding this comment.
This is the change to control the presence of SPIRV-Tools-shared DLL and import lib.
Comment on lines
+4
to
+8
| # The static libary is always available. | ||
| # It offers full public symbol visibility. | ||
| target_link_libraries(main PRIVATE SPIRV-Tools-static) | ||
| # In triplets with dynamic library linkage, there is also a shared libary. | ||
| target_link_libraries(main PRIVATE SPIRV-Tools-shared) |
There was a problem hiding this comment.
The tool libs need always a main lib with all symbols, but for distros, they recommend the shared lib with reduced symbol visibility.
I don't think there is better solution here without patching against upstream's will.
Cf. KhronosGroup/SPIRV-Tools#3909
MonicaLiu0311
added
the
category:port-bug
shadercThe usage test passed (header files found): spirv-toolsAll features are tested successfully in the following triplet: The usage test passed (header files found): 🔴 post-build error: |
Fixed, thanks. |
MonicaLiu0311
approved these changes
Jun 13, 2023
MonicaLiu0311
added
the
info:reviewed
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.
Fixes #31510.
Fixes #28144.
No version update in this PR.
./vcpkg x-add-version --alland committing the result.