Changeset 19314 for trunk

Timestamp:

10/27/18 20:00:55 (6 years ago)

Author:

tbretz

Message:

Just removed the need for __CMAKE__ by renaming the Makefile qt4 ui files.

Location:

trunk/FACT++

Files:

• CMakeLists.txt (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• gui/MainWindow.h (modified) (1 diff)
• gui/RawEventsViewer/RawEventsViewer.h (modified) (1 diff)

trunk/FACT++/CMakeLists.txt

@@ -205 +205 @@
 SET(CMAKE_CXX_STANDARD 11)
 
-ADD_DEFINITIONS(-D__CMAKE__)
+#ADD_DEFINITIONS(-D__CMAKE__)
 
 SET(CMAKE_CXX_FLAGS

trunk/FACT++/Makefile.am

@@ -656 +656 @@
 
 .ui.h: $<
-        $(AM_V_GEN)$(UIC4) $< -o $@
+        $(AM_V_GEN)$(UIC4) $< -o ui_$@
 
 .h.moc.cc: $<

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.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;