From a07019a828706f79bf707729ddba929d9792af62 Mon Sep 17 00:00:00 2001
From: "m.marn" <m.marn@gsi.de>
Date: Thu, 2 Nov 2023 07:24:44 +0000
Subject: [PATCH] Generate qt files before compilation
Instead of having them in git
See merge request silecs/opensilecs!59
---
silecs-diagnostic-cpp/CMakeLists.txt | 4 ++++
.../src/silecs-diagnostic/diagnostictoolmainview.cpp | 2 +-
.../src/silecs-diagnostic/displayarraydialog.cpp | 2 +-
.../src/silecs-diagnostic/generated/.gitignore | 3 ---
silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
delete mode 100644 silecs-diagnostic-cpp/src/silecs-diagnostic/generated/.gitignore
diff --git a/silecs-diagnostic-cpp/CMakeLists.txt b/silecs-diagnostic-cpp/CMakeLists.txt
index 4118ab8..3c83152 100644
--- a/silecs-diagnostic-cpp/CMakeLists.txt
+++ b/silecs-diagnostic-cpp/CMakeLists.txt
@@ -5,6 +5,10 @@ project(silecs-diagnostic LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
# TODO: Which of these compiler options are actually required?
add_compile_options(
-Wall
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp b/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp
index b5f8c56..7f299d4 100755
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp
+++ b/silecs-diagnostic-cpp/src/silecs-diagnostic/diagnostictoolmainview.cpp
@@ -19,7 +19,7 @@ Contributors:
#include <QtWidgets/QMenu>
#include <silecs-diagnostic/diagnostictoolmainview.h>
-#include <silecs-diagnostic/generated/ui_diagnostictoolmainview.h>
+#include <resources/gui/ui_diagnostictoolmainview.h>
#include <silecs-diagnostic/utils.h>
#include <silecs-communication/interface/utility/XMLParser.h>
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp b/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp
index abe15f4..7d9f850 100755
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp
+++ b/silecs-diagnostic-cpp/src/silecs-diagnostic/displayarraydialog.cpp
@@ -12,7 +12,7 @@ Contributors:
#include <silecs-diagnostic/displayarraydialog.h>
-#include <silecs-diagnostic/generated/ui_displayarraydialog.h>
+#include <resources/gui/ui_displayarraydialog.h>
#include <QtCore/QDebug>
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/generated/.gitignore b/silecs-diagnostic-cpp/src/silecs-diagnostic/generated/.gitignore
deleted file mode 100644
index dee64ae..0000000
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/generated/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/ui_*
-/moc_*
-/qrc_*
\ No newline at end of file
diff --git a/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp b/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp
index c83c215..6096bc6 100755
--- a/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp
+++ b/silecs-diagnostic-cpp/src/silecs-diagnostic/logindialog.cpp
@@ -12,7 +12,7 @@ Contributors:
#include <silecs-diagnostic/logindialog.h>
-#include <silecs-diagnostic/generated/ui_logindialog.h>
+#include <resources/gui/ui_logindialog.h>
LoginDialog::LoginDialog(QWidget *parent) :
--
GitLab