fixup! WIP: Switch to Meson

2 files changed, 41 insertions, 11 deletions

diff --git a/meson.build b/meson.build
index 781a9d4..6f3b4e7 100644
--- a/meson.build
+++ b/meson.build
@@ -22,8 +22,8 @@ cpp = meson.get_compiler('cpp')
 
 # Enable Objective C support if we're building for MacOS
 if host_machine.system() == 'darwin'
-  add_languages(['objc'])
-  objcc = meson.get_compiler('objc')
+  add_languages(['objcpp'])
+  objcpp = meson.get_compiler('objcpp')
 endif
 
 # Set ultra strict warnings for developers, if requested
@@ -257,7 +257,7 @@ endif
 if gtk2_dep.found() and gtk2_quartz_dep.found()
   shared_module('suil_cocoa_in_gtk2',
                 'src/cocoa_in_gtk2.mm',
-                dependencies: [gtk3_dep, lv2_dep, qt5_dep],
+                dependencies: [gtk2_dep, lv2_dep, qt5_dep],
                 gnu_symbol_visibility: 'hidden',
                 include_directories: include_directories(['include']),
                 install: true)
diff --git a/meson/meson.build b/meson/meson.build
index 20e0522..99d54d2 100644
--- a/meson/meson.build
+++ b/meson/meson.build
@@ -181,16 +181,46 @@ if is_variable('cpp')
   endif
 endif
 
-# Set all_objc_warnings for the current Objective C compiler
-if is_variable('objcc')
-  all_objc_warnings = []
-  if objcc.get_id() == 'clang'
-    all_objc_warnings = ['-Weverything']
-  elif objc.get_id() == 'gcc'
-    all_objc_warnings = gcc_common_warnings + [
+# Set all_objcpp_warnings for the current Objective C++ compiler
+if is_variable('objcpp')
+  all_objcpp_warnings = []
+  if objcpp.get_id() == 'clang'
+    all_objcpp_warnings = ['-Weverything']
+  elif objcpp.get_id() == 'gcc'
+    all_objcpp_warnings = gcc_common_warnings + [
       '-Wno-direct-ivar-access',
     ]
   else
-    all_objc_warnings = []
+    all_objcpp_warnings = gcc_common_warnings + [
+      '-Wabi-tag',
+      '-Waligned-new=all',
+      '-Wcatch-value=3',
+      '-Wcomma-subscript',
+      '-Wconditionally-supported',
+      '-Wctor-dtor-privacy',
+      '-Wdeprecated-copy-dtor',
+      '-Weffc++',
+      '-Wextra-semi',
+      '-Wmismatched-tags',
+      '-Wmultiple-inheritance',
+      '-Wno-direct-ivar-access',
+      '-Wnoexcept',
+      '-Wnoexcept-type',
+      '-Wnon-virtual-dtor',
+      '-Wold-style-cast',
+      '-Woverloaded-virtual',
+      '-Wplacement-new=2',
+      '-Wredundant-tags',
+      '-Wregister',
+      '-Wsign-promo',
+      '-Wstrict-null-sentinel',
+      '-Wsuggest-final-methods',
+      '-Wsuggest-final-types',
+      '-Wsuggest-override',
+      '-Wuseless-cast',
+      '-Wvirtual-inheritance',
+      '-Wvolatile',
+      '-Wzero-as-null-pointer-constant',
+    ]
   endif
 endif