Skip to content

Commit

Permalink
Try to add meson dependency for stdx-allocator
Browse files Browse the repository at this point in the history
  • Loading branch information
wilzbach committed Nov 21, 2017
1 parent 0e174cf commit 2f27cb4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/subprojects/stdx-allocator.wrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[wrap-git]
directory=stdx-allocator
url=https://github.com/wilzbach/stdx-allocator
revision=head
3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ if meson.get_compiler('d').get_id() == 'llvm'
add_global_arguments(['-d-version=VibeLibeventDriver',
'-d-version=Have_openssl',
'-d-version=Have_diet_ng',
'-d-version=Have_stdx-allocator',
flag_new_openssl_ldc], language : 'd')
endif
if meson.get_compiler('d').get_id() == 'dmd'
add_global_arguments(['-version=VibeLibeventDriver',
'-version=Have_openssl',
'-version=Have_diet_ng',
'-version=Have_stdx-allocator',
flag_new_openssl_dmd], language : 'd')
endif
if meson.get_compiler('d').get_id() == 'gnu'
Expand All @@ -56,6 +58,7 @@ endif
# we need to search for this dependency after setting global compiler flags, because
# it may pull in a subproject after which setting global flags is not allowed anymore
diet_dep = dependency('diet', fallback: ['diet', 'diet_dep'])
allocator_dep = dependency('stdx-allocator', fallback: ['stdx-allocator', 'stdx-allocator_dep'])

# directory where the external dependencies are included from.
# Meson will search for this dir in both build_root and source_root
Expand Down

0 comments on commit 2f27cb4

Please sign in to comment.