Changeset 19312


Ignore:
Timestamp:
Oct 27, 2018, 7:51:31 PM (11 months ago)
Author:
tbretz
Message:
Defining a preprocessor directive for our __CMAKE__ build avoids to produce two additional unnecessray output files.
Location:
trunk/FACT++
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/CMakeLists.txt

    r19303 r19312  
    205205SET(CMAKE_CXX_STANDARD 11)
    206206
     207ADD_DEFINITIONS(-D__CMAKE__)
     208
    207209SET(CMAKE_CXX_FLAGS
    208210        "${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
     
    210212         -Wnon-virtual-dtor -Wshadow -Wno-unknown-pragmas") # -Wextra
    211213
    212 # FIXME: Move that to config.h.in
    213214# -D__MARS__
    214215SET(CMAKE_CXX_FLAGS
     
    726727# ********************************************************
    727728
    728 INCLUDE_DIRECTORIES(/usr/include/qwt-qt4 gui gui/RawEventsViewer)
    729 FILE(WRITE ${CMAKE_BINARY_DIR}/design.h "#include \"ui_design.h\"")
    730 FILE(WRITE ${CMAKE_BINARY_DIR}/viewer.h "#include \"ui_viewer.h\"")
     729INCLUDE_DIRECTORIES(${QWT_INCLUDE_DIR}/qwt-qt4 gui gui/RawEventsViewer)
    731730
    732731# --------------------------------------------------------
     
    739738        gui/QCameraWidget.h
    740739        gui/Q3DCameraWidget.h)
     740
     741SET(_moc ${CMAKE_BINARY_DIR}/${_current_MOC})
    741742
    742743ADD_EXECUTABLE(viewer
  • trunk/FACT++/gui/MainWindow.h

    r17211 r19312  
    22#define FACT_MainWindow
    33
     4#ifdef __CMAKE__
     5#include "ui_design.h"
     6#else
    47#include "design.h"
     8#endif
    59
    610#include <QMainWindow>
  • trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.cc

    r19300 r19312  
    1313
    1414#include "RawEventsViewer.h"
    15 #include "viewer.h"
    1615
    1716#include <QFileDialog>
  • trunk/FACT++/gui/RawEventsViewer/RawEventsViewer.h

    r18986 r19312  
    198198 * Class UIConnector. used to connect the interface to the raw data displayer
    199199 *************************************************/
     200#ifndef __CMAKE__
    200201#include "viewer.h"
     202#else
     203#include "ui_viewer.h"
     204#endif
    201205
    202206class Configuration;
Note: See TracChangeset for help on using the changeset viewer.