Index: /trunk/FACT++/CMakeLists.txt
===================================================================
--- /trunk/FACT++/CMakeLists.txt	(revision 19311)
+++ /trunk/FACT++/CMakeLists.txt	(revision 19312)
@@ -205,4 +205,6 @@
 SET(CMAKE_CXX_STANDARD 11)
 
+ADD_DEFINITIONS(-D__CMAKE__)
+
 SET(CMAKE_CXX_FLAGS
 	"${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
@@ -210,5 +212,4 @@
          -Wnon-virtual-dtor -Wshadow -Wno-unknown-pragmas") # -Wextra
 
-# FIXME: Move that to config.h.in
 # -D__MARS__
 SET(CMAKE_CXX_FLAGS
@@ -726,7 +727,5 @@
 # ********************************************************
 
-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,4 +738,6 @@
 	gui/QCameraWidget.h
 	gui/Q3DCameraWidget.h)
+
+SET(_moc ${CMAKE_BINARY_DIR}/${_current_MOC})
 
 ADD_EXECUTABLE(viewer
Index: /trunk/FACT++/gui/MainWindow.h
===================================================================
--- /trunk/FACT++/gui/MainWindow.h	(revision 19311)
+++ /trunk/FACT++/gui/MainWindow.h	(revision 19312)
@@ -2,5 +2,9 @@
 #define FACT_MainWindow
 
+#ifdef __CMAKE__
+#include "ui_design.h"
+#else
 #include "design.h"
+#endif
 
 #include <QMainWindow>
Index: /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc
===================================================================
--- /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 19311)
+++ /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc	(revision 19312)
@@ -13,5 +13,4 @@
 
 #include "RawEventsViewer.h"
-#include "viewer.h"
 
 #include <QFileDialog>
Index: /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h
===================================================================
--- /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 19311)
+++ /trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h	(revision 19312)
@@ -198,5 +198,9 @@
  * 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;