Skip to content

build: Add options to override subproject paths #1846

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
K1ngst0m wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build: Add options to override subproject paths #1846

Show file tree
Hide file tree
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
21 changes: 17 additions & 4 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,23 @@ dep_x11 = dependency('x11')
dep_wayland = dependency('wayland-client')
vulkan_dep = dependency('vulkan')

glm_proj = subproject('glm')
glm_dep = glm_proj.get_variable('glm_dep')
stb_proj = subproject('stb')
stb_dep = stb_proj.get_variable('stb_dep')
glm_include_dir = get_option('glm_include_dir')
if glm_include_dir != ''
glm_inc = include_directories(glm_include_dir)
glm_dep = declare_dependency(include_directories : glm_inc)
else
glm_proj = subproject('glm')
glm_dep = glm_proj.get_variable('glm_dep')
endif

stb_include_dir = get_option('stb_include_dir')
if stb_include_dir != ''
stb_inc = include_directories(stb_include_dir)
stb_dep = declare_dependency(include_directories : stb_inc)
else
stb_proj = subproject('stb')
stb_dep = stb_proj.get_variable('stb_dep')
endif

if get_option('enable_openvr_support')
openvr_dep = dependency('openvr', version: '>= 2.7', required : false)
Expand Down
2 changes: 2 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ option('enable_gamescope', type : 'boolean', value : true, description
option('enable_gamescope_wsi_layer', type : 'boolean', value : true, description: 'Build Gamescope layer')
option('enable_openvr_support', type : 'boolean', value : true, description: 'OpenVR Integrations')
option('benchmark', type: 'feature', description: 'Benchmark tools')
option('glm_include_dir', type : 'string', value : '', description: 'Custom path to override GLM headers')
option('stb_include_dir', type : 'string', value : '', description: 'Custom path to override STB headers')