summaryrefslogtreecommitdiffstats
path: root/meson.build
diff options
context:
space:
mode:
authorJean-Michaƫl Celerier <jeanmichael.celerier@gmail.com>2024-07-08 05:17:23 -0400
committerDavid Robillard <d@drobilla.net>2024-07-11 19:41:00 -0400
commit35804e3346e687f01cbdd22738a46af6a38b43da (patch)
treed9c86d44d76b67f9d59cb8749473a61d1569effb /meson.build
parentb050405c4912d29ea518cd7eea23e892be918e47 (diff)
downloadsuil-35804e3346e687f01cbdd22738a46af6a38b43da.tar.gz
suil-35804e3346e687f01cbdd22738a46af6a38b43da.tar.bz2
suil-35804e3346e687f01cbdd22738a46af6a38b43da.zip
Add support for X11 in Qt6
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build24
1 files changed, 22 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 3089ce8..29c8467 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@ project(
'b_ndebug=if-release',
'buildtype=release',
'c_std=c99',
- 'cpp_std=c++14',
+ 'cpp_std=c++17',
],
license: 'ISC',
meson_version: '>= 0.56.0',
@@ -124,6 +124,13 @@ qt5_x11_dep = dependency(
required: get_option('qt5').enabled() and get_option('x11').enabled(),
)
+qt6_dep = dependency(
+ 'Qt6Widgets',
+ include_type: 'system',
+ version: '>=6.2.0',
+ required: get_option('qt6'),
+)
+
if host_machine.system() == 'darwin' and not get_option('cocoa').disabled()
objcpp.has_header(
'QMacCocoaViewContainer',
@@ -279,7 +286,7 @@ endif
if qt5_dep.found() and qt5_x11_dep.found()
shared_module(
'suil_x11_in_qt5',
- files('src/x11_in_qt5.cpp'),
+ files('src/x11_in_qt.cpp'),
cpp_args: cpp_suppressions + platform_defines,
dependencies: [lv2_dep, qt5_dep, qt5_x11_dep],
gnu_symbol_visibility: 'hidden',
@@ -308,6 +315,19 @@ if host_machine.system() == 'darwin'
endif
endif
+if qt6_dep.found()
+ shared_module(
+ 'suil_x11_in_qt6',
+ files('src/x11_in_qt.cpp'),
+ cpp_args: cpp_suppressions + platform_defines,
+ dependencies: [lv2_dep, qt6_dep],
+ gnu_symbol_visibility: 'hidden',
+ include_directories: include_dirs,
+ install: true,
+ install_dir: suil_module_dir,
+ )
+endif
+
#########
# Tests #
#########