diff options
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | meson/library/meson.build | 5 | ||||
| -rw-r--r-- | meson/suppressions/meson.build | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 4e04012..63e9e13 100644 --- a/meson.build +++ b/meson.build @@ -34,7 +34,7 @@ endif # Enable Objective C support if we're building for MacOS if host_machine.system() == 'darwin' - add_languages(['objc'], native: false) + add_languages(['objc', 'objcpp'], native: false) objcc = meson.get_compiler('objc') endif @@ -46,7 +46,7 @@ endif # Disable deprecated API which is not used by tests or examples add_project_arguments(['-DPUGL_DISABLE_DEPRECATED'], - language: ['c', 'cpp', 'objc']) + language: ['c', 'cpp', 'objc', 'objcpp']) ############# # Platforms # @@ -155,7 +155,10 @@ library_args = ['-DPUGL_INTERNAL'] subdir('meson/library') if library_type == 'static_library' - add_project_arguments(['-DPUGL_STATIC'], language: ['c', 'cpp', 'objc']) + add_project_arguments( + ['-DPUGL_STATIC'], + language: ['c', 'cpp', 'objc', 'objcpp'], + ) endif common_sources = files( diff --git a/meson/library/meson.build b/meson/library/meson.build index 1d4c36c..722406e 100644 --- a/meson/library/meson.build +++ b/meson/library/meson.build @@ -21,5 +21,8 @@ elif get_option('default_library') == 'shared' library_type = 'shared_library' else library_type = 'static_library' - add_project_arguments(['-DPUGL_STATIC'], language: ['c', 'cpp', 'objc']) + add_project_arguments( + ['-DPUGL_STATIC'], + language: ['c', 'cpp', 'objc', 'objcpp'], + ) endif diff --git a/meson/suppressions/meson.build b/meson/suppressions/meson.build index b3744f9..a6e6f43 100644 --- a/meson/suppressions/meson.build +++ b/meson/suppressions/meson.build @@ -139,6 +139,7 @@ if is_variable('objcc') '-Wno-poison-system-directories', ] - add_project_arguments(objcc.get_supported_arguments(objc_suppressions), - language: ['objc']) + objc_suppressions = objcc.get_supported_arguments(objc_suppressions) + add_project_arguments(objc_suppressions, language: ['objc']) + add_project_arguments(objc_suppressions, language: ['objcpp']) endif |