From 38727df9a30cd86775c41c25b8ae9124468f857b Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 12 Nov 2018 12:08:36 +0100 Subject: [PATCH] Compile shapes demo with meson --- meson.build | 2 +- orte/contrib/meson.build | 1 + orte/contrib/shape/meson.build | 38 ++++++++++++++++++++++++++++++++++ orte/meson.build | 2 +- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 orte/contrib/meson.build create mode 100644 orte/contrib/shape/meson.build diff --git a/meson.build b/meson.build index 6c683e0..bd36ca0 100644 --- a/meson.build +++ b/meson.build @@ -1,3 +1,3 @@ -project('orte', 'c') +project('orte', ['c', 'cpp']) subdir('orte') diff --git a/orte/contrib/meson.build b/orte/contrib/meson.build new file mode 100644 index 0000000..0d2d60d --- /dev/null +++ b/orte/contrib/meson.build @@ -0,0 +1 @@ +subdir('shape') diff --git a/orte/contrib/shape/meson.build b/orte/contrib/shape/meson.build new file mode 100644 index 0000000..3e4efc2 --- /dev/null +++ b/orte/contrib/shape/meson.build @@ -0,0 +1,38 @@ +qt4 = import('qt4') + +qt_dep = dependency('qt4', modules: ['Core', 'Gui']) + +if qt_dep.found() + + preprocessed = qt4.preprocess( + moc_headers: [ + 'FPublisher.h', + 'FSubscriber.h', + 'MainForm.h', + 'MyQFrame.h', + 'richtext.h', + ], + ui_files: [ 'MainForm.ui', 'FPublisher.ui', 'FSubscriber.ui' ], + qresources: 'shapes.qrc', + ) + + executable( + 'ortedemo', + sources: [ + 'main.cpp', + 'MainForm.cpp', + 'MyQFrame.cpp', + 'richtext.cpp', + 'FPublisher.cpp', + 'FSubscriber.cpp', + 'BoxType.c', + preprocessed, + ], + include_directories: include_directories('../../include'), + dependencies: [ + liborte_dep, + qt_dep, + ] + ) + +endif diff --git a/orte/meson.build b/orte/meson.build index a1f9a50..f26be58 100644 --- a/orte/meson.build +++ b/orte/meson.build @@ -1,4 +1,3 @@ -# subdir('contrib') subdir('idl-compiler') subdir('include') # subdir('java') @@ -6,3 +5,4 @@ subdir('include') subdir('liborte') subdir('manager') subdir('examples') +subdir('contrib') -- 2.39.2