Changeset 19312 for trunk/FACT++/gui

Timestamp:

10/27/18 19:51:31 (6 years ago)

Author:

tbretz

Message:

Defining a preprocessor directive for our __CMAKE__ build avoids to produce two additional unnecessray output files.

Location:

trunk/FACT++/gui

Files:

• MainWindow.h (modified) (1 diff)
• RawEventsViewer/RawEventsViewer.cc (modified) (1 diff)
• RawEventsViewer/RawEventsViewer.h (modified) (1 diff)

trunk/FACT++/gui/MainWindow.h

@@ -2 +2 @@
 #define FACT_MainWindow
 
+#ifdef __CMAKE__
+#include "ui_design.h"
+#else
 #include "design.h"
+#endif
 
 #include <QMainWindow>

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

@@ -13 +13 @@
 
 #include "RawEventsViewer.h"
-#include "viewer.h"
 
 #include <QFileDialog>

trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h

@@ -198 +198 @@
  * Class UIConnector. used to connect the interface to the raw data displayer
  *************************************************/
+#ifndef __CMAKE__
 #include "viewer.h"
+#else
+#include "ui_viewer.h"
+#endif
 
 class Configuration;