Vulkan backend fails to build on Linux (Fedora 42) (#3734)

Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
This commit is contained in:
Joel Winarske
2025-09-10 07:47:42 -07:00
committed by GitHub
parent dfbb0de2a9
commit 31176840fa
2 changed files with 4 additions and 1 deletions

View File

@@ -16,7 +16,7 @@ pkg_search_module(ICUUC icu-uc)
pkg_search_module(ICUI18N icu-i18n) pkg_search_module(ICUI18N icu-i18n)
find_program(ARMERGE NAMES armerge) find_program(ARMERGE NAMES armerge)
if(MLN_WITH_WAYLAND) if(MLN_WITH_WAYLAND AND NOT MLN_WITH_VULKAN)
# See https://github.com/maplibre/maplibre-native/pull/2022 # See https://github.com/maplibre/maplibre-native/pull/2022
# MLN_WITH_EGL needs to be set for Wayland, otherwise this CMakeLists will # MLN_WITH_EGL needs to be set for Wayland, otherwise this CMakeLists will

3
vendor/vulkan.cmake vendored
View File

@@ -44,6 +44,9 @@ endif()
get_target_property(glslang_inc glslang INTERFACE_INCLUDE_DIRECTORIES) get_target_property(glslang_inc glslang INTERFACE_INCLUDE_DIRECTORIES)
set_target_properties(glslang PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${glslang_inc}) set_target_properties(glslang PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${glslang_inc})
if (NOT (WIN32 OR MINGW))
target_compile_options(SPIRV PRIVATE -include cstdint)
endif()
set_target_properties( set_target_properties(
glslang glslang