Added cmakelists

3 files changed, 15 insertions, 24 deletions

diff --git a/src/about/CMakeLists.txt b/src/about/CMakeLists.txt
new file mode 100644
index 0000000..f1e2c41
--- /dev/null
+++ b/src/about/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(about STATIC
+    aboutdialog.cpp aboutdialog.h aboutdialog.ui
+    aboutplugin.cpp aboutplugin.h aboutplugin.ui
+)
+target_link_libraries(about PUBLIC Qt6::Widgets Qt6::SvgWidgets)
+target_include_directories(about PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+# tests
+add_executable(test_about test/main.cpp)
+target_link_libraries(test_about PRIVATE about)
+add_test(NAME about_dialog COMMAND $<TARGET_FILE:test_about> -platform offscreen)
+set_property(TEST about_dialog PROPERTY ENVIRONMENT autoclose=1)
diff --git a/src/about/aboutdialog.cpp b/src/about/aboutdialog.cpp
index 894b1ec..1013866 100644
--- a/src/about/aboutdialog.cpp
+++ b/src/about/aboutdialog.cpp
@@ -8,7 +8,6 @@
 
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
-#include <version.h>
 
 // compiler
 // clang also defines __GNUC__, so we need to check for clang first
@@ -59,7 +58,7 @@ AboutDialog::AboutDialog(QWidget *parent)
                                  "<p>This program is distributed in the hope that it will be useful, but without any warranty.</p>"
                                  "<p>You can read the full terms of the license on <a href='https://www.gnu.org/licenses/gpl-3.0.en.html'>the GNU website</a>.</p>"));
 
-    ui->detailsLabel->setText(tr("<p>Version " poi_Version "</p>"
+    ui->detailsLabel->setText(tr("<p>Version %1</p>"
                                  "<p>Compiled with " compiler "</p>"
                                  "<p>Libraries: <ul>"
                                  "<li><a href='https://www.qt.io/'>Qt5</a> " QT_VERSION_STR "</li>"
@@ -69,7 +68,8 @@ AboutDialog::AboutDialog(QWidget *parent)
 #ifdef CONFIG_USEBREAKPAD
                                  "<li><a href='https://chromium.googlesource.com/breakpad/breakpad'>Breakpad</a></li>"
 #endif
-                                 "</ul></p>"));
+                                 "</ul></p>")
+                                  .arg(qApp->applicationVersion()));
 }
 
 AboutDialog::~AboutDialog()
diff --git a/src/about/meson.build b/src/about/meson.build
deleted file mode 100644
index 49274a8..0000000
--- a/src/about/meson.build
+++ /dev/null
@@ -1,21 +0,0 @@
-about_moc = mod_qt5.preprocess(
-  moc_headers: ['aboutdialog.h', 'aboutplugin.h'],
-  ui_files: ['aboutdialog.ui', 'aboutplugin.ui'],
-  dependencies: dep_qt5
-)
-
-dep_about = declare_dependency(
-  include_directories: '.',
-  link_with: static_library('about',
-    [ 'aboutdialog.cpp', 'aboutplugin.cpp', about_moc, version_h],
-    dependencies: [dep_qt5])
-)
-
-poi_sourceset.add(dep_about)
-
-test('about dialog', executable('about',
-  sources: 'test/main.cpp',
-  dependencies: [ dep_qt5, dep_about, dep_catch ]),
-  args: [ '-platform', 'offscreen' ],
-  env: 'autoclose=1'
-)