From: Michal Sojka Date: Mon, 12 Nov 2018 11:08:36 +0000 (+0100) Subject: Compile shapes demo with meson X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/refs/heads/tmp Compile shapes demo with meson --- 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..fa5d75f --- /dev/null +++ b/orte/contrib/shape/meson.build @@ -0,0 +1,32 @@ +qt4 = import('qt4') + +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, + dependency('qt4', modules: ['Core', 'Gui']), + ] +) 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')