[glibmm] Meson build: No implicit_include_directories

From: Kjell Ahlstedt <kjellahl src gnome org>
To: commits-list gnome org
Cc:
Subject: [glibmm] Meson build: No implicit_include_directories
Date: Fri, 26 Mar 2021 12:22:30 +0000 (UTC)
commit ba1238301805d86ed1b4219375c1b26a998b684d
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Mar 26 13:18:00 2021 +0100

    Meson build: No implicit_include_directories
    
    It shall not be possible to find a glibmm header file
    with #include <xxx.h> instead of #include <glibmm/xxx.h>.
    Not fully fixed until https://github.com/mesonbuild/meson/issues/8562
    has been fixed.

 gio/giomm/meson.build               | 2 ++
 gio/src/appinfo.ccg                 | 2 +-
 gio/src/asyncinitable.ccg           | 2 +-
 gio/src/bufferedinputstream.ccg     | 2 +-
 gio/src/bufferedoutputstream.ccg    | 2 +-
 gio/src/datainputstream.ccg         | 2 +-
 gio/src/dbusaddress.ccg             | 2 +-
 gio/src/dbusconnection.ccg          | 2 +-
 gio/src/dbusinterfacevtable.ccg     | 2 +-
 gio/src/dbussubtreevtable.ccg       | 2 +-
 gio/src/drive.ccg                   | 2 +-
 gio/src/file.ccg                    | 2 +-
 gio/src/fileenumerator.ccg          | 2 +-
 gio/src/fileinputstream.ccg         | 2 +-
 gio/src/fileiostream.ccg            | 2 +-
 gio/src/fileoutputstream.ccg        | 2 +-
 gio/src/inputstream.ccg             | 2 +-
 gio/src/iostream.ccg                | 2 +-
 gio/src/loadableicon.ccg            | 2 +-
 gio/src/mount.ccg                   | 2 +-
 gio/src/networkaddress.ccg          | 2 +-
 gio/src/networkmonitor.ccg          | 2 +-
 gio/src/networkservice.ccg          | 2 +-
 gio/src/outputstream.ccg            | 2 +-
 gio/src/permission.ccg              | 2 +-
 gio/src/proxy.ccg                   | 2 +-
 gio/src/proxyresolver.ccg           | 2 +-
 gio/src/resolver.ccg                | 2 +-
 gio/src/socket.ccg                  | 2 +-
 gio/src/socketaddress.ccg           | 2 +-
 gio/src/socketaddressenumerator.ccg | 2 +-
 gio/src/socketclient.ccg            | 2 +-
 gio/src/socketconnection.ccg        | 2 +-
 gio/src/socketlistener.ccg          | 2 +-
 gio/src/tlsconnection.ccg           | 2 +-
 gio/src/tlsdatabase.ccg             | 2 +-
 gio/src/tlsinteraction.ccg          | 2 +-
 gio/src/unixconnection.ccg          | 2 +-
 gio/src/volume.ccg                  | 2 +-
 glib/glibmm/meson.build             | 2 ++
 tools/extra_defs_gen/meson.build    | 1 +
 41 files changed, 43 insertions(+), 38 deletions(-)
---
diff --git a/gio/giomm/meson.build b/gio/giomm/meson.build
index ecb7efa8..fad7ce98 100644
--- a/gio/giomm/meson.build
+++ b/gio/giomm/meson.build
@@ -311,6 +311,7 @@ if maintainer_mode
     giomm_used_built_cc_file_targets, giomm_extra_cc_files, built_dummy_h_file_target,
     version: glibmm_libversion,
     darwin_versions: macos_darwin_versions,
+    implicit_include_directories: false,
     include_directories: extra_include_dirs,
     cpp_args: giomm_cpp_flags,
     dependencies: giomm_build_dep,
@@ -360,6 +361,7 @@ else # not maintainer_mode
     built_cc_files, giomm_extra_cc_files,
     version: glibmm_libversion,
     darwin_versions: macos_darwin_versions,
+    implicit_include_directories: false,
     include_directories: extra_include_dirs,
     cpp_args: giomm_cpp_flags,
     dependencies: giomm_build_dep,
diff --git a/gio/src/appinfo.ccg b/gio/src/appinfo.ccg
index 6be12b9a..5c4a7170 100644
--- a/gio/src/appinfo.ccg
+++ b/gio/src/appinfo.ccg
@@ -16,7 +16,7 @@
 
 #include <giomm/file.h>
 #include <glibmm/vectorutils.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 #include <gio/gio.h>
 
 namespace Gio
diff --git a/gio/src/asyncinitable.ccg b/gio/src/asyncinitable.ccg
index f6fda2f8..314c5b3f 100644
--- a/gio/src/asyncinitable.ccg
+++ b/gio/src/asyncinitable.ccg
@@ -18,7 +18,7 @@
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
 #include <giomm/cancellable.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/bufferedinputstream.ccg b/gio/src/bufferedinputstream.ccg
index 56dfe24b..c4ed802a 100644
--- a/gio/src/bufferedinputstream.ccg
+++ b/gio/src/bufferedinputstream.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <glibmm/error.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/bufferedoutputstream.ccg b/gio/src/bufferedoutputstream.ccg
index 80e9d078..9de9e814 100644
--- a/gio/src/bufferedoutputstream.ccg
+++ b/gio/src/bufferedoutputstream.ccg
@@ -15,7 +15,7 @@
  */
 
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/datainputstream.ccg b/gio/src/datainputstream.ccg
index d5b31b46..bcf7f3bb 100644
--- a/gio/src/datainputstream.ccg
+++ b/gio/src/datainputstream.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <glibmm/error.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/dbusaddress.ccg b/gio/src/dbusaddress.ccg
index 09a21888..c9d128fc 100644
--- a/gio/src/dbusaddress.ccg
+++ b/gio/src/dbusaddress.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <glibmm/error.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index a8d57996..67dceee8 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -27,7 +27,7 @@
 #include <giomm/unixfdlist.h>
 #endif
 
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 #include <mutex>
 
 namespace
diff --git a/gio/src/dbusinterfacevtable.ccg b/gio/src/dbusinterfacevtable.ccg
index d47b5a9b..15cf0ace 100644
--- a/gio/src/dbusinterfacevtable.ccg
+++ b/gio/src/dbusinterfacevtable.ccg
@@ -21,7 +21,7 @@
 #include <giomm/dbusmethodinvocation.h>
 #include <giomm/dbusconnection.h>
 #include <giomm/dbuserror.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace
 {
diff --git a/gio/src/dbussubtreevtable.ccg b/gio/src/dbussubtreevtable.ccg
index 59ea2741..8783077f 100644
--- a/gio/src/dbussubtreevtable.ccg
+++ b/gio/src/dbussubtreevtable.ccg
@@ -21,7 +21,7 @@
 #include <giomm/dbusmethodinvocation.h>
 #include <giomm/dbusconnection.h>
 #include <giomm/dbuserror.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace
 {
diff --git a/gio/src/drive.ccg b/gio/src/drive.ccg
index 95186ea4..f8e0796e 100644
--- a/gio/src/drive.ccg
+++ b/gio/src/drive.ccg
@@ -18,7 +18,7 @@
 #include <giomm/volume.h>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 using StartStopType = Gio::Drive::StartStopType;
 
diff --git a/gio/src/file.ccg b/gio/src/file.ccg
index 2e8f4282..3fab96d2 100644
--- a/gio/src/file.ccg
+++ b/gio/src/file.ccg
@@ -19,7 +19,7 @@
 #include <utility>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace
 {
diff --git a/gio/src/fileenumerator.ccg b/gio/src/fileenumerator.ccg
index 9b975bc6..58830c0c 100644
--- a/gio/src/fileenumerator.ccg
+++ b/gio/src/fileenumerator.ccg
@@ -18,7 +18,7 @@
 #include <giomm/file.h>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/fileinputstream.ccg b/gio/src/fileinputstream.ccg
index 9280054c..9bd02160 100644
--- a/gio/src/fileinputstream.ccg
+++ b/gio/src/fileinputstream.ccg
@@ -15,7 +15,7 @@
  */
 
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 #include <glibmm/exceptionhandler.h>
 
 namespace Gio
diff --git a/gio/src/fileiostream.ccg b/gio/src/fileiostream.ccg
index f358384b..32c4337a 100644
--- a/gio/src/fileiostream.ccg
+++ b/gio/src/fileiostream.ccg
@@ -15,7 +15,7 @@
  */
 
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 #include <glibmm/exceptionhandler.h>
 
 namespace Gio
diff --git a/gio/src/fileoutputstream.ccg b/gio/src/fileoutputstream.ccg
index d1180606..a95ce4ec 100644
--- a/gio/src/fileoutputstream.ccg
+++ b/gio/src/fileoutputstream.ccg
@@ -18,7 +18,7 @@
 #include <glib.h>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/inputstream.ccg b/gio/src/inputstream.ccg
index 620f93d9..35c15319 100644
--- a/gio/src/inputstream.ccg
+++ b/gio/src/inputstream.ccg
@@ -17,7 +17,7 @@
 #include <gio/gio.h>
 #include <glibmm/error.h>
 #include <giomm/asyncresult.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/iostream.ccg b/gio/src/iostream.ccg
index 800932d9..d26ca0e9 100644
--- a/gio/src/iostream.ccg
+++ b/gio/src/iostream.ccg
@@ -17,7 +17,7 @@
 #include <gio/gio.h>
 #include <glibmm/error.h>
 #include <giomm/asyncresult.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/loadableicon.ccg b/gio/src/loadableicon.ccg
index 22f69504..3641c7c0 100644
--- a/gio/src/loadableicon.ccg
+++ b/gio/src/loadableicon.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <glibmm/error.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/mount.ccg b/gio/src/mount.ccg
index 6a4fd364..a989b866 100644
--- a/gio/src/mount.ccg
+++ b/gio/src/mount.ccg
@@ -19,7 +19,7 @@
 #include <giomm/drive.h>
 #include <giomm/volume.h>
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/networkaddress.ccg b/gio/src/networkaddress.ccg
index 6f2f99d6..9c56a1f5 100644
--- a/gio/src/networkaddress.ccg
+++ b/gio/src/networkaddress.ccg
@@ -17,7 +17,7 @@
 #include <gio/gio.h>
 #include <glibmm/error.h>
 #include <giomm/asyncresult.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/networkmonitor.ccg b/gio/src/networkmonitor.ccg
index 1cd79efe..78976614 100644
--- a/gio/src/networkmonitor.ccg
+++ b/gio/src/networkmonitor.ccg
@@ -16,7 +16,7 @@
 
 #include <glibmm/exceptionhandler.h>
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/networkservice.ccg b/gio/src/networkservice.ccg
index a081e60f..184527ee 100644
--- a/gio/src/networkservice.ccg
+++ b/gio/src/networkservice.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <giomm/asyncresult.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/outputstream.ccg b/gio/src/outputstream.ccg
index da48f7d6..e340c2a1 100644
--- a/gio/src/outputstream.ccg
+++ b/gio/src/outputstream.ccg
@@ -17,7 +17,7 @@
 #include <gio/gio.h>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 using SpliceFlags = Gio::OutputStream::SpliceFlags;
 
diff --git a/gio/src/permission.ccg b/gio/src/permission.ccg
index f647cbef..4d804e94 100644
--- a/gio/src/permission.ccg
+++ b/gio/src/permission.ccg
@@ -15,7 +15,7 @@
  */
 
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/proxy.ccg b/gio/src/proxy.ccg
index bac28f6f..7331996f 100644
--- a/gio/src/proxy.ccg
+++ b/gio/src/proxy.ccg
@@ -18,7 +18,7 @@
 #include <utility>
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/proxyresolver.ccg b/gio/src/proxyresolver.ccg
index 9d0a0a39..d68b0ccb 100644
--- a/gio/src/proxyresolver.ccg
+++ b/gio/src/proxyresolver.ccg
@@ -19,7 +19,7 @@
 #include <glibmm/error.h>
 #include <glibmm/exceptionhandler.h>
 #include <glibmm/vectorutils.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/resolver.ccg b/gio/src/resolver.ccg
index 6efdf6ba..12390313 100644
--- a/gio/src/resolver.ccg
+++ b/gio/src/resolver.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <glibmm/error.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace {
 
diff --git a/gio/src/socket.ccg b/gio/src/socket.ccg
index 31cf2404..e997c947 100644
--- a/gio/src/socket.ccg
+++ b/gio/src/socket.ccg
@@ -18,7 +18,7 @@
 #include <glibmm/error.h>
 #include <giomm/asyncresult.h>
 #include <giomm/socketsource.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 using Type = Gio::Socket::Type;
 using Protocol = Gio::Socket::Protocol;
diff --git a/gio/src/socketaddress.ccg b/gio/src/socketaddress.ccg
index f5d23a7b..fdb204e0 100644
--- a/gio/src/socketaddress.ccg
+++ b/gio/src/socketaddress.ccg
@@ -17,7 +17,7 @@
 #include <gio/gio.h>
 #include <glibmm/error.h>
 #include <giomm/asyncresult.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/socketaddressenumerator.ccg b/gio/src/socketaddressenumerator.ccg
index 9e014836..4e4e921d 100644
--- a/gio/src/socketaddressenumerator.ccg
+++ b/gio/src/socketaddressenumerator.ccg
@@ -17,7 +17,7 @@
 #include <gio/gio.h>
 #include <glibmm/error.h>
 #include <giomm/socketaddress.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/socketclient.ccg b/gio/src/socketclient.ccg
index 8339f12d..8f17c65d 100644
--- a/gio/src/socketclient.ccg
+++ b/gio/src/socketclient.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <giomm/asyncresult.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/socketconnection.ccg b/gio/src/socketconnection.ccg
index 13c25693..b4fb3d76 100644
--- a/gio/src/socketconnection.ccg
+++ b/gio/src/socketconnection.ccg
@@ -15,7 +15,7 @@
  */
 
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/socketlistener.ccg b/gio/src/socketlistener.ccg
index c85394e2..df6d582a 100644
--- a/gio/src/socketlistener.ccg
+++ b/gio/src/socketlistener.ccg
@@ -15,7 +15,7 @@
  */
 
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/tlsconnection.ccg b/gio/src/tlsconnection.ccg
index 7697ed9f..cd5414b7 100644
--- a/gio/src/tlsconnection.ccg
+++ b/gio/src/tlsconnection.ccg
@@ -20,7 +20,7 @@
 #include <giomm/tlsinteraction.h>
 #include <giomm/tlsclientconnectionimpl.h>
 #include <giomm/tlsserverconnectionimpl.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/tlsdatabase.ccg b/gio/src/tlsdatabase.ccg
index f351f208..61b499c1 100644
--- a/gio/src/tlsdatabase.ccg
+++ b/gio/src/tlsdatabase.ccg
@@ -19,7 +19,7 @@
 #include <giomm/socketconnectable.h>
 #include <giomm/tlscertificate.h>
 #include <giomm/tlsinteraction.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 using VerifyFlags = Gio::TlsDatabase::VerifyFlags;
 using LookupFlags = Gio::TlsDatabase::LookupFlags;
diff --git a/gio/src/tlsinteraction.ccg b/gio/src/tlsinteraction.ccg
index 2252149c..2a43a278 100644
--- a/gio/src/tlsinteraction.ccg
+++ b/gio/src/tlsinteraction.ccg
@@ -18,4 +18,4 @@
 #include <gio/gio.h>
 #include <giomm/cancellable.h>
 #include <giomm/tlspassword.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
diff --git a/gio/src/unixconnection.ccg b/gio/src/unixconnection.ccg
index 3b9929c8..b3ec278d 100644
--- a/gio/src/unixconnection.ccg
+++ b/gio/src/unixconnection.ccg
@@ -16,7 +16,7 @@
 
 #include <gio/gio.h>
 #include <gio/gunixconnection.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/gio/src/volume.ccg b/gio/src/volume.ccg
index e0ad7c47..c3734d65 100644
--- a/gio/src/volume.ccg
+++ b/gio/src/volume.ccg
@@ -19,7 +19,7 @@
 #include <giomm/file.h>
 #include <giomm/drive.h>
 #include <gio/gio.h>
-#include "slot_async.h"
+#include <giomm/slot_async.h>
 
 namespace Gio
 {
diff --git a/glib/glibmm/meson.build b/glib/glibmm/meson.build
index 72370378..5ba85320 100644
--- a/glib/glibmm/meson.build
+++ b/glib/glibmm/meson.build
@@ -246,6 +246,7 @@ if maintainer_mode
 
   glibmm_library = library(glibmm_libname, extra_glibmm_objects,
     glibmm_built_cc_file_targets, glibmm_extra_cc_files, built_dummy_h_file_target,
+    implicit_include_directories: false,
     include_directories: extra_include_dirs,
     cpp_args: glibmm_cpp_args,
     version: glibmm_libversion,
@@ -299,6 +300,7 @@ else # not maintainer_mode
 
   glibmm_library = library(glibmm_libname, extra_glibmm_objects,
     built_cc_files, glibmm_extra_cc_files,
+    implicit_include_directories: false,
     include_directories: extra_include_dirs,
     cpp_args: glibmm_cpp_args,
     version: glibmm_libversion,
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build
index df4ca5a2..b954f309 100644
--- a/tools/extra_defs_gen/meson.build
+++ b/tools/extra_defs_gen/meson.build
@@ -10,6 +10,7 @@ glibmm_generate_extra_defs_library = library(
   'generate_extra_defs.cc',
   version: glibmm_libversion,
   darwin_versions: macos_darwin_versions,
+  implicit_include_directories: false,
   cpp_args: '-DGLIBMM_GEN_EXTRA_DEFS_BUILD',
   dependencies: glibmm_build_dep,
   install: true,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]