Merge pull request #2586 from denizzzka/meson_2

Meson: fixes using vibe.d as subproject
vibe-d · Aug 13, 2021 · 35b097c · 35b097c
2 parents c6b32ed + bff3fb1
commit 35b097c
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/meson.build b/meson.build
@@ -30,20 +30,21 @@ if ssl_dep.version().version_compare('>=1.1')
     flag_new_openssl_dmd = '-version=VibeUseOpenSSL11'
 endif
 
-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')
+if meson.is_subproject() == false
+    if meson.get_compiler('d').get_id() == 'llvm'
+        add_global_arguments(['-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=Have_openssl',
+                              '-version=Have_diet_ng',
+                              '-version=Have_stdx_allocator',
+                              flag_new_openssl_dmd], language : 'd')
+    endif
 endif
+
 if meson.get_compiler('d').get_id() == 'gnu'
     error('Vibe.d can not be compiled with GDC at time (2016). Sorry.')
 endif