Skip to content

meson: support both pkg-config files installed by SPIRV-Cross #16778

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −2
Open

meson: support both pkg-config files installed by SPIRV-Cross #16778

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
27 changes: 25 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,8 +991,31 @@ if features['posix']
features += {'posix-shm': cc.has_function('shm_open', prefix: '#include <sys/mman.h>')}
endif

spirv_cross = dependency('spirv-cross-c-shared', required:
get_option('spirv-cross').require(features['win32-desktop']))
prefer_static = get_option('prefer_static')

spirv_cross_deps = ['spirv-cross-c-shared']
spirv_cross_required = get_option('spirv-cross').require(features['win32-desktop']).enabled()
spirv_cross_preferred_check_failed = false

if prefer_static
spirv_cross_deps = ['spirv-cross-c'] + spirv_cross_deps
else
spirv_cross_deps += ['spirv-cross-c']
endif

foreach spirv_dep : spirv_cross_deps
spirv_cross = dependency(
spirv_dep,
required: spirv_cross_required and spirv_cross_preferred_check_failed
)
if not spirv_cross.found()
spirv_cross_preferred_check_failed = true
continue
endif

break
endforeach
Comment on lines +998 to +1017
Copy link
Member

Choose a reason for hiding this comment

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

Would this work for you?

Suggested change
spirv_cross_preferred_check_failed = false
if prefer_static
spirv_cross_deps = ['spirv-cross-c'] + spirv_cross_deps
else
spirv_cross_deps += ['spirv-cross-c']
endif
foreach spirv_dep : spirv_cross_deps
spirv_cross = dependency(
spirv_dep,
required: spirv_cross_required and spirv_cross_preferred_check_failed
)
if not spirv_cross.found()
spirv_cross_preferred_check_failed = true
continue
endif
break
endforeach
foreach arg : [[prefer_static, false], [not prefer_static, spirv_cross_required]]
spirv_cross = dependency(arg[0] ? 'spirv-cross-c' : 'spirv-cross-c-shared', required: arg[1])
if spirv_cross.found()
break
endif
endforeach


features += {'spirv-cross': spirv_cross.found()}
if features['spirv-cross']
dependencies += spirv_cross
Expand Down
Loading