Update bin2h.cmake to avoid -Werror=missing-braces #419
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
axsaucedo
reviewed
May 25, 2025
| else() | ||
| target_link_libraries(kompute PUBLIC Vulkan::Vulkan | ||
| kp_logger | ||
| kp_shader | ||
| fmt::fmt) |
axsaucedo
reviewed
May 25, 2025
| @@ -94,7 +92,7 @@ add_subdirectory(shaders) | |||
| add_subdirectory(include) | |||
|
|
|||
| if(KOMPUTE_OPT_INSTALL) | |||
| if (KOMPUTE_OPT_USE_BUILT_IN_FMT) | |||
| if (NOT KOMPUTE_OPT_USE_SPDLOG AND KOMPUTE_OPT_USE_BUILT_IN_FMT) | |||
There was a problem hiding this comment.
What is the need for the extra guard check?
axsaucedo
reviewed
May 25, 2025
| @@ -95,12 +95,12 @@ function(BIN2H) | |||
| set(namespaceStart "namespace ${HEADER_NAMESPACE} {") | |||
| set(namespaceEnd "} // namespace ${HEADER_NAMESPACE}") | |||
| set(arrayIncludes "#pragma once\n#include <array>\n#include <cstdint>") | |||
| set(arrayDefinition "const std::array<uint32_t, ${arraySize}> ${BIN2H_VARIABLE_NAME} = { ${arrayValues} };") | |||
| set(arrayDefinition "const std::array<uint32_t, ${arraySize}> ${BIN2H_VARIABLE_NAME} = { { ${arrayValues} } };") | |||
There was a problem hiding this comment.
Would this work for both spdlog and fmt?
axsaucedo
requested changes
May 25, 2025
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 header files generated by
bin2h.cmakecause an error when the GCC flag-Werror=missing-bracesis enabled. I fixed this by adding another set of braces around${arrayValues}on Line 98.Edit: I pushed some more changes to my fork which automatically got included in this PR. My new changes make use of FMT in SPDLOG instead of the system-installed version.