Changeset 18990 for trunk

Timestamp:

04/06/18 17:00:47 (7 years ago)

Author:

tbretz

Message:

Mostly changes to properly implement Qt support and get the GUIs compiled.

File:

• trunk/FACT++/CMakeLists.txt (modified) (16 diffs)

trunk/FACT++/CMakeLists.txt

@@ -97 +97 @@
 FIND_PACKAGE(GLUT)
 FIND_PACKAGE(Curses) # FIXME : Requires ncurses panel
-FIND_PACKAGE(ZLIB REQUIRED)
-FIND_PACKAGE(Threads REQUIRED)
+FIND_PACKAGE(ZLIB REQUIRED)     # ZLIB::ZLIB
+FIND_PACKAGE(Threads REQUIRED)  # Threads::Threads
+FIND_PACKAGE(OpenGL REQUIRED)   # OpenGL::GL OpenGL::GLU
 
 INCLUDE_DIRECTORIES("/usr/include/mysql")
@@ -116 +117 @@
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
-# =============== QT5 ==============
-#find_package(Qt5Widgets)
+# =============== QT4 ==============
 #SET(CMAKE_AUTOMOC ON)
 #SET(CMAKE_AUTORCC ON)
-SET(CMAKE_INCLUDE_CURRENT_DIR)
-FIND_PACKAGE(Qt5 COMPONENTS Core Widgets Xml REQUIRED)
-#INCLUDE_DIRECTORIES(${Qt5_INCLUDE_DIR})
+SET(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+#    set(CMAKE_AUTOMOC ON)
+#    set(CMAKE_INCLUDE_CURRENT_DIR ON)
+#    find_package(Qt4 4.4.3 REQUIRED QtGui QtXml)
+#    add_executable(myexe main.cpp)
+#    target_link_libraries(myexe Qt4::QtGui Qt4::QtXml)
+
+# QtCore QtSql QtOpenGL QtXml
+FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtOpenGL QtSql QtXml)
+INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${QT_QTGUI_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${QT_QTSQL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${QT_QTXML_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${QT_QTCORE_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${QT_QTOPENGL_INCLUDE_DIR})
+
+MESSAGE(${QT_INCLUDE_DIR})
+MESSAGE(${QT_QTGUI_INCLUDE_DIR})
+MESSAGE(${QT_QTSQL_INCLUDE_DIR})
+MESSAGE(${QT_QTXML_INCLUDE_DIR})
+MESSAGE(${QT_QTCORE_INCLUDE_DIR})
+MESSAGE(${QT_QTOPENGL_INCLUDE_DIR})
 
 # dbus-1 dbus-glib-1
@@ -155 +175 @@
 SET(CMAKE_CXX_FLAGS
         "${CMAKE_CXX_FLAGS} \
-         -D_REENTRANT -D__LINUX__ -DHAVE_ZLIB -DHAVE_V8 -DHAVE_SQL -DHAVE_NOVA \
+         -D_REENTRANT -D__LINUX__ \
+         -DHAVE_ZLIB -DHAVE_ROOT -DHAVE_V8 -DHAVE_SQL -DHAVE_NOVA -DHAVE_FITS \
          -DMARSVER=\\\"${VERSION}\\\" \
          -DPACKAGE_VERSION=\\\"${VERSION}\\\" \
          -DREVISION=\\\"${REVISION}\\\" \
+         -DPACKAGE_NAME=\\\"FACT++\\\" \
          -DPACKAGE_STRING=\\\"FACT++\\\" \
          -DPACKAGE_URL=\\\"${PACKAGE_URL}\\\" \
@@ -185 +207 @@
 # -lASImage -lMinuit -lHistPainter -lThread
 
-FIND_PACKAGE(ROOT REQUIRED COMPONENTS Gui Minuit)
+FIND_PACKAGE(ROOT REQUIRED COMPONENTS GQt)
 INCLUDE_DIRECTORIES(${ROOT_INCLUDE_DIRS})
 
@@ -200 +222 @@
 #ROOT_<command>_CMD     PATH    Full path for each ROOT executable (rootcling, root, hadd, etc.)
 #ROOT_<option>_FOUND    BOOL    True for each enabled build option (e.g. cocoa, python, xrootd, etc.)
+
+MESSAGE(${ROOT_LIBRARIES})
+
 
 # -------------------------------------------------------
@@ -395 +420 @@
 
 ADD_EXECUTABLE(fitsdump src/fitsdump.cc)
-TARGET_LINK_LIBRARIES(fitsdump ${HELP++LIBS} ZLIB::ZLIB)
+TARGET_LINK_LIBRARIES(fitsdump ${HELP++LIBS} ${ROOT_LIBRARIES} ZLIB::ZLIB)
 MANPAGE(fitsdump "")
 
@@ -488 +513 @@
 #       StateMachine Tools Configuration Time Dim++ Dim DimExtension
 #        ${Boost_LIBRARIES} readline ncurses)
+
+ADD_EXECUTABLE(datalogger src/datalogger.cc
+        src/DimState.cc
+        src/FitsFile.cc src/Fits.cc)
+TARGET_LINK_LIBRARIES(datalogger ${FACT++LIBS} cfitsio CCfits)
+MANPAGE(datalogger "")
 
 ADD_EXECUTABLE(dimctrl src/dimctrl.cc
@@ -510 +541 @@
 MANPAGE(evtserver "")
 
+ADD_EXECUTABLE(fadctrl src/fadctrl.cc src/HeadersFAD.cc
+        src/EventBuilder.cc
+        src/FitsFile.cc
+        src/DataCalib.cc
+        src/DataWriteRaw.cc
+        src/DataWriteFits.cc
+        src/DataWriteFits2.cc
+        src/DataProcessorImp.cc)
+TARGET_LINK_LIBRARIES(fadctrl ${FACT++LIBS} cfitsio CCfits ZLIB::ZLIB)
+MANPAGE(fadctrl "")
+
 ADD_EXECUTABLE(feedback src/feedback.cc)
 TARGET_LINK_LIBRARIES(feedback ${FACT++LIBS})
@@ -523 +565 @@
 
 ADD_EXECUTABLE(gcn src/gcn.cc)
-TARGET_LINK_LIBRARIES(gcn ${FACT++LIBS} ${NOVA_LIBRARY})
+TARGET_LINK_LIBRARIES(gcn ${FACT++LIBS} ${NOVA_LIBRARY} Qt4::QtXml)
 MANPAGE(gcn "")
-QT5_USE_MODULES(gcn Xml)
 
 ADD_EXECUTABLE(gpsctrl src/gpsctrl.cc)
@@ -532 +573 @@
 
 ADD_EXECUTABLE(lidctrl src/lidctrl.cc)
-TARGET_LINK_LIBRARIES(lidctrl ${FACT++LIBS})
-QT5_USE_MODULES(lidctrl Xml)
+TARGET_LINK_LIBRARIES(lidctrl ${FACT++LIBS} Qt4::QtXml)
 MANPAGE(lidctrl "")
 
@@ -553 +593 @@
 
 ADD_EXECUTABLE(pwrctrl src/pwrctrl.cc src/HeadersPower.cc)
-TARGET_LINK_LIBRARIES(pwrctrl ${FACT++LIBS})
+TARGET_LINK_LIBRARIES(pwrctrl ${FACT++LIBS} Qt4::QtXml)
 MANPAGE(pwrctrl "")
-QT5_USE_MODULES(pwrctrl Xml)
 
 ADD_EXECUTABLE(ratecontrol src/ratecontrol.cc)
@@ -590 +629 @@
 
 ADD_EXECUTABLE(tngweather src/tngweather.cc)
-TARGET_LINK_LIBRARIES(tngweather ${FACT++LIBS})
+TARGET_LINK_LIBRARIES(tngweather ${FACT++LIBS} Qt4::QtXml)
 MANPAGE(tngweather "")
-QT5_USE_MODULES(tngweather Xml)
 
 #ADD_EXECUTABLE(triggerschedule src/triggerschedule.cc)
@@ -598 +636 @@
 #MANPAGE(triggerschedule "")
 
-# *****************************************************************
+
+
+# ********************************************************
+# ****************** GUI Applications ********************
+# ********************************************************
+
+INCLUDE_DIRECTORIES(/usr/include/qwt-qt4 gui gui/RawEventsViewer)
+FILE(WRITE ${CMAKE_BINARY_DIR}/design.h "#include \"ui_design.h\"")
+
+# --------------------------------------------------------
+
+QT4_WRAP_UI(VIEWER_QT_HEADERS gui/RawEventsViewer/viewer.ui)
+
+QT4_WRAP_CPP(VIEWER_QT_SOURCES
+        gui/RawEventsViewer/RawEventsViewer.h
+        gui/BasicGlCamera.h
+        gui/QCameraWidget.h
+        gui/Q3DCameraWidget.h)
+
+ADD_EXECUTABLE(viewer
+        gui/RawEventsViewer/RawEventsViewer.cc
+        gui/BasicGlCamera.cc
+        gui/QCameraWidget.cc
+        gui/Q3DCameraWidget.cc
+        ${VIEWER_QT_HEADERS}
+        ${VIEWER_QT_SOURCES})
+
+TARGET_LINK_LIBRARIES(viewer
+        ${Boost_LIBRARIES} Configuration mysqlpp
+        Qt4::QtGui Qt4::QtOpenGL
+        GL GLU qwt-qt4 ZLIB::ZLIB)
+
+# --------------------------------------------------------
+
+QT4_ADD_RESOURCES(FACT_QT_RESOURCES gui/design.qrc)
+
+QT4_WRAP_UI(FACT_QT_HEADERS gui/design.ui)
+
+QT4_WRAP_CPP(FACT_QT_SOURCES
+        gui/DockWindow.h
+        gui/MainWindow.h
+        gui/QCameraWidget.h
+        gui/BasicGlCamera.h)
+
+ADD_EXECUTABLE(fact gui/fact.cc
+        gui/DockWindow.cc
+        gui/MainWindow.cc
+        gui/QCameraWidget.cc
+        gui/BasicGlCamera.cc
+        gui/HtmlDelegate.cc
+        gui/CheckBoxDelegate.cc
+        src/DimNetwork.cc
+        ${FACT_QT_HEADERS}
+        ${FACT_QT_SOURCES}
+        ${FACT_QT_RESOURCES})
+
+TARGET_LINK_LIBRARIES(fact
+        ${FACT++LIBS}
+        ${ROOT_LIBRARIES}
+        Qt4::QtGui Qt4::QtOpenGL Qt4::QtSql
+        GL GLU qwt-qt4 ZLIB::ZLIB)
+
 
 #dclient5_SOURCES = src/dclient5.cc src/LocalControl.h
@@ -604 +703 @@
 #    libConfiguration.la
 
-#fadctrl_SOURCES = src/fadctrl.cc src/LocalControl.h src/HeadersFAD.cc \
-#       src/EventBuilder.cc     src/EventBuilder.h \
-#       src/DataProcessorImp.cc src/DataProcessorImp.h \
-#       src/DataCalib.cc        src/DataCalib.h \
-#       src/DataWriteRaw.cc     src/DataWriteRaw.h \
-#       src/DrsCalib.h
-#if HAS_FITS
-#fadctrl_SOURCES += src/FitsFile.h src/FitsFile.cc \
-#       src/DataWriteFits.cc    src/DataWriteFits.h \
-#       src/DataWriteFits2.cc   src/DataWriteFits2.h
-#endif
-##fadctrl_LDADD   = libDim++.la libDim.la  libDimExtension.la \
-#       libStateMachine.la libTools.la libTime.la \
-#       libConfiguration.la
-
 #argv_SOURCES = src/argv.cc
 #argv_LDADD = libConfiguration.la
@@ -628 +712 @@
 #test_LDADD = libStateMachine.la libTools.la libTime.la libDim++.la libDim.la libConfiguration.la
 
-#datalogger_SOURCES = src/datalogger.cc src/LocalControl.h src/DimState.cc src/DimState.h
-#if HAS_FITS
-#datalogger_SOURCES += src/FitsFile.h src/FitsFile.cc src/Fits.h src/Fits.cc
-#endif
-#datalogger_LDADD  = libDim++.la libDim.la libDimExtension.la \
-#       libStateMachine.la libTools.la libTime.la \
-#       libConfiguration.la
-
-# -----
-
-#if HAS_GUI
-
-#fact_DIALOGS = \
-#       gui/design.ui
-
-#fact_RESOURCES = \
-#       gui/design.qrc
-
-#fact_QT_SOURCES = \
-#       gui/DockWindow.cc \
-#       gui/MainWindow.cc \
-#       gui/QCameraWidget.cc \
-#       gui/BasicGlCamera.cc
-
-#fact_SRCADD = $(fact_DIALOGS:.ui=.h) $(fact_RESOURCES:.qrc=.cc) $(fact_QT_SOURCES:.cc=.moc.cc)
-
-#endif
-
-# -----
-
-#if HAS_VIEWER
-
-#viewer_DIALOGS = \
-#       gui/RawEventsViewer/viewer.ui
-
-#viewer_QT_SOURCES = \
-#       gui/RawEventsViewer/RawEventsViewer.cc \
-#       gui/BasicGlCamera.cc \
-#       gui/QCameraWidget.cc \
-#       gui/Q3DCameraWidget.cc
-
-#viewer_SRCADD = $(viewer_DIALOGS:.ui=.h) $(viewer_RESOURCES:.qrc=.cc) $(viewer_QT_SOURCES:.cc=.moc.cc)
-
-#endif
-
+
+
+
+# ********************************************************
+# ********************** FAMOUS **************************
+# ********************************************************
 
 IF(FOUND_FAMOUS)
@@ -702 +747 @@
 #       MANPAGE(ratecontrol "")
 ENDIF()
+
+
+
+# ********************************************************
+# ********************** IceACT **************************
+# ********************************************************
 
 IF(FOUND_ICEACT)