From 7bc12ac0be0ce8887b1537c137b3c349259dd58d Mon Sep 17 00:00:00 2001
From: Dave Griffiths <dave@thentrythis.org>
Date: Fri, 14 Oct 2022 22:18:52 +0100
Subject: [PATCH] cmake build fixes

---
 CMakeLists.txt                  | 28 ++++++++++++++--------------
 app/MainWindow.h                |  2 +-
 app/SettingsDialog.h            |  2 +-
 {gui => app/gui}/buttons.svg    |  0
 {gui => app/gui}/samplebrain.ui |  0
 {gui => app/gui}/settings.ui    |  0
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename {gui => app/gui}/buttons.svg (100%)
 rename {gui => app/gui}/samplebrain.ui (100%)
 rename {gui => app/gui}/settings.ui (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bdb307..3fbc382 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(QT NAMES Qt5 Qt6 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui Widgets)
 
-qt_add_executable(samplebrain WIN32 MACOSX_BUNDLE
+add_executable(samplebrain WIN32 MACOSX_BUNDLE
     app/MainWindow.cpp app/MainWindow.h
     app/SettingsDialog.cpp app/SettingsDialog.h
     app/audio_thread.cpp
@@ -46,8 +46,8 @@ qt_add_executable(samplebrain WIN32 MACOSX_BUNDLE
     brain/src/spiralcore/stream.cpp
     brain/src/status.cpp
     brain/src/window.cpp
-    gui/samplebrain.ui
-    gui/settings.ui
+    app/gui/samplebrain.ui
+    app/gui/settings.ui
 )
 target_include_directories(samplebrain PRIVATE
     .
@@ -55,9 +55,9 @@ target_include_directories(samplebrain PRIVATE
 )
 
 target_link_libraries(samplebrain PRIVATE
-    Qt::Core
-    Qt::Gui
-    Qt::Widgets
+    Qt5::Core
+    Qt5::Gui
+    Qt5::Widgets
     fftw3
     lo_shared
     portaudio
@@ -74,14 +74,14 @@ set(samplebrain_resource_files
     "app/images/stop.png"
 )
 
-qt_add_resources(samplebrain "samplebrain"
-    PREFIX
-        "/images"
-    BASE
-        "app"
-    FILES
-        ${samplebrain_resource_files}
-)
+#qt5_add_resources(samplebrain "samplebrain"
+#    PREFIX
+#        "/images"
+#    BASE
+#        "app"
+#    FILES
+#        ${samplebrain_resource_files}
+#)
 
 install(TARGETS samplebrain
     BUNDLE DESTINATION .
diff --git a/app/MainWindow.h b/app/MainWindow.h
index 48ab6b5..9b97127 100644
--- a/app/MainWindow.h
+++ b/app/MainWindow.h
@@ -19,7 +19,7 @@
 #include <QFileDialog>
 #include <QLineEdit>
 #include <QMessageBox>
-#include "ui_samplebrain.h"
+#include "gui/ui_samplebrain.h"
 #include "SettingsDialog.h"
 
 #include <iostream>
diff --git a/app/SettingsDialog.h b/app/SettingsDialog.h
index 225e188..ebb9666 100644
--- a/app/SettingsDialog.h
+++ b/app/SettingsDialog.h
@@ -21,7 +21,7 @@
 #include <QDialog>
 #include <QLineEdit>
 #include <QSettings>
-#include "ui_settings.h"
+#include "gui/ui_settings.h"
 
 #include <iostream>
 #include <lo/lo.h>
diff --git a/gui/buttons.svg b/app/gui/buttons.svg
similarity index 100%
rename from gui/buttons.svg
rename to app/gui/buttons.svg
diff --git a/gui/samplebrain.ui b/app/gui/samplebrain.ui
similarity index 100%
rename from gui/samplebrain.ui
rename to app/gui/samplebrain.ui
diff --git a/gui/settings.ui b/app/gui/settings.ui
similarity index 100%
rename from gui/settings.ui
rename to app/gui/settings.ui