Add test for building the implementation as included C++

4 files changed, 170 insertions, 4 deletions

diff --git a/meson.build b/meson.build
index 50cc19f..f5e8f12 100644
--- a/meson.build
+++ b/meson.build
@@ -140,7 +140,15 @@ if get_option('strict')
 
   # Objective C warnings
   if is_variable('objcc')
-    add_project_arguments(objcc.get_supported_arguments(all_objc_warnings),
+    objc_warnings = all_objc_warnings
+
+    objc_warnings += [
+      '-Wno-deprecated-declarations',
+      '-Wno-direct-ivar-access',
+      '-Wno-pedantic',
+    ]
+
+    add_project_arguments(objcc.get_supported_arguments(objc_warnings),
                           language: ['objc'])
   endif
 endif
@@ -204,9 +212,6 @@ if host_machine.system() == 'darwin'
   core_deps = [cocoa_dep, corevideo_dep]
   extension = '.m'
 
-  add_project_arguments(['-Wno-deprecated-declarations'], language: ['objc'])
-  add_project_arguments(['-Wno-direct-ivar-access'], language: ['objc'])
-
   add_project_arguments(['-DGL_SILENCE_DEPRECATION'],
                         language: ['c', 'objc'])
 
diff --git a/test/meson.build b/test/meson.build
index de4bd71..bd838f3 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -65,3 +65,44 @@ if vulkan_dep.found()
                     dependencies: [pugl_dep, vulkan_backend_dep]))
   endforeach
 endif
+
+unified_args = []
+unified_deps = [core_deps]
+if cairo_dep.found()
+  unified_args += ['-DWITH_CAIRO']
+  unified_deps += [cairo_dep]
+endif
+
+if opengl_dep.found()
+  unified_args += ['-DWITH_OPENGL']
+  unified_deps += [opengl_dep]
+endif
+
+if vulkan_dep.found()
+  unified_args += ['-DWITH_VULKAN']
+  unified_deps += [vulkan_deps]
+endif
+
+if host_machine.system() == 'darwin'
+  add_languages(['objcpp'])
+
+  objcpp = meson.get_compiler('objcpp')
+  unified_args += objcpp.get_supported_arguments(
+    c_warnings + cpp_warnings + objc_warnings)
+
+  executable('inline_objcpp', 'test_inline_objcpp.mm',
+             include_directories: include_directories(includes),
+             dependencies: unified_deps,
+             objcpp_args: unified_args)
+elif is_variable('cpp')
+  if cpp.get_id() == 'msvc'
+    unified_args += [
+      '/wd4464' # relative include path contains '..'
+    ]
+  endif
+
+  executable('inline_cpp', 'test_inline_cpp.cpp',
+             include_directories: include_directories(includes),
+             dependencies: unified_deps,
+             cpp_args: unified_args)
+endif
diff --git a/test/test_inline_cpp.cpp b/test/test_inline_cpp.cpp
new file mode 100644
index 0000000..1950415
--- /dev/null
+++ b/test/test_inline_cpp.cpp
@@ -0,0 +1,70 @@
+/*
+  Copyright 2021 David Robillard <d@drobilla.net>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+// Tests that the implementation compiles as included C++
+
+#define PUGL_API
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#  pragma clang diagnostic ignored "-Wold-style-cast"
+#elif defined(__GNUC__)
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
+
+#include "../src/implementation.c" // IWYU pragma: keep
+
+#if defined(_WIN32)
+#  include "../src/win.c"      // IWYU pragma: keep
+#  include "../src/win.h"      // IWYU pragma: keep
+#  include "../src/win_stub.c" // IWYU pragma: keep
+#  if defined(WITH_CAIRO)
+#    include "../src/win_cairo.c" // IWYU pragma: keep
+#  endif
+#  if defined(WITH_OPENGL)
+#    include "../src/win_gl.c" // IWYU pragma: keep
+#  endif
+#  if defined(WITH_VULKAN)
+#    include "../src/win_vulkan.c" // IWYU pragma: keep
+#  endif
+
+#else
+#  include "../src/x11.c"      // IWYU pragma: keep
+#  include "../src/x11_stub.c" // IWYU pragma: keep
+#  if defined(WITH_CAIRO)
+#    include "../src/x11_cairo.c" // IWYU pragma: keep
+#  endif
+#  if defined(WITH_OPENGL)
+#    include "../src/x11_gl.c" // IWYU pragma: keep
+#  endif
+#  if defined(WITH_VULKAN)
+#    include "../src/x11_vulkan.c" // IWYU pragma: keep
+#  endif
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#  pragma GCC diagnostic pop
+#endif
+
+int
+main(void)
+{
+  return 0;
+}
diff --git a/test/test_inline_objcpp.mm b/test/test_inline_objcpp.mm
new file mode 100644
index 0000000..7be9b50
--- /dev/null
+++ b/test/test_inline_objcpp.mm
@@ -0,0 +1,50 @@
+/*
+  Copyright 2021 David Robillard <d@drobilla.net>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+// Tests that the implementation compiles as included ObjC++
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#  pragma clang diagnostic ignored "-Wold-style-cast"
+#endif
+
+#include "../src/implementation.c" // IWYU pragma: keep
+#include "../src/mac.h"            // IWYU pragma: keep
+#include "../src/mac.m"            // IWYU pragma: keep
+#include "../src/mac_stub.m"       // IWYU pragma: keep
+
+#if defined(WITH_CAIRO)
+#  include "../src/mac_cairo.m" // IWYU pragma: keep
+#endif
+
+#if defined(WITH_OPENGL)
+#  include "../src/mac_gl.m" // IWYU pragma: keep
+#endif
+
+#if defined(WITH_VULKAN)
+#  include "../src/mac_vulkan.m" // IWYU pragma: keep
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+
+int
+main(void)
+{
+  return 0;
+}