From 4f0c4cf4f6dfa615568e595d75140a9baca1ffa8 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Thu, 1 Jan 2026 22:48:26 +0100 Subject: [PATCH] Some stuff --- conanfile.py | 8 ++++++++ meson.build | 9 +++++---- src/gui/main.cpp | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 87a42a6..f93be4b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -12,6 +12,14 @@ class daw_projectConan(ConanFile): exports_sources = "meson.build", "src/*" + default_options = { + "qt/*:shared": True, + } + + def requirements(self): + self.requires("conan-test-lib/0.0.2") + self.requires("qt/6.10.1") + def layout(self): self.folders.build = "build" self.folders.generators = "build/scripts" diff --git a/meson.build b/meson.build index 5c43bc4..3dda900 100644 --- a/meson.build +++ b/meson.build @@ -2,11 +2,12 @@ project('daw-exp ', 'cpp') qt_dep = dependency('qt6', modules: ['Core', 'Widgets']) jack_dep = dependency('jack', required : true) +test_dep = dependency('conan-test-lib', required: true) -executable('daw-project', 'src/engine/main.cpp', - dependencies: [jack_dep], - install: true) +#executable('daw-project', 'src/engine/main.cpp', +# dependencies: [jack_dep, test_dep], +# install: true) executable('daw-gui', 'src/gui/main.cpp', - dependencies: [qt_dep], + dependencies: [qt_dep, test_dep], install: true) diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 9fae47e..e402eb6 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -1,9 +1,11 @@ #include #include #include "./control_panel.cpp" +#include int main(int argc, char **argv) { + conan_test_lib(); QApplication app (argc, argv); add_button();