Changeset 19312

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++

Files:

• CMakeLists.txt (modified) (4 diffs)
• gui/MainWindow.h (modified) (1 diff)
• gui/RawEventsViewer/RawEventsViewer.cc (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__)
+
 SET(CMAKE_CXX_FLAGS
         "${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
@@ -210 +212 @@
          -Wnon-virtual-dtor -Wshadow -Wno-unknown-pragmas") # -Wextra
 
-# FIXME: Move that to config.h.in
 # -D__MARS__
 SET(CMAKE_CXX_FLAGS
@@ -726 +727 @@
 # ********************************************************
 
-INCLUDE_DIRECTORIES(/usr/include/qwt-qt4 gui gui/RawEventsViewer)
-FILE(WRITE ${CMAKE_BINARY_DIR}/design.h "#include \"ui_design.h\"")
-FILE(WRITE ${CMAKE_BINARY_DIR}/viewer.h "#include \"ui_viewer.h\"")
+INCLUDE_DIRECTORIES(${QWT_INCLUDE_DIR}/qwt-qt4 gui gui/RawEventsViewer)
 
 # --------------------------------------------------------
@@ -739 +738 @@
         gui/QCameraWidget.h
         gui/Q3DCameraWidget.h)
+
+SET(_moc ${CMAKE_BINARY_DIR}/${_current_MOC})
 
 ADD_EXECUTABLE(viewer

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;