mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 12:57:13 +02:00
cmath + cleaning
This commit is contained in:
@ -51,26 +51,12 @@ set(HEADERS
|
|||||||
include/qTabDebugging.h
|
include/qTabDebugging.h
|
||||||
include/qTabDeveloper.h
|
include/qTabDeveloper.h
|
||||||
include/qTabMessages.h
|
include/qTabMessages.h
|
||||||
../slsDetectorSoftware/include
|
|
||||||
../slsSupportLib/include/versionAPI.h
|
|
||||||
../slsSupportLib/include/ServerSocket.h
|
|
||||||
../slsSupportLib/include/ServerInterface2.h
|
|
||||||
)
|
)
|
||||||
set(RESOURCES
|
set(RESOURCES
|
||||||
include/icons.qrc
|
include/icons.qrc
|
||||||
)
|
)
|
||||||
qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
|
qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
|
||||||
|
|
||||||
include_directories(
|
|
||||||
include
|
|
||||||
slsDetectorPlotting/include
|
|
||||||
../slsSupportLib/include
|
|
||||||
${QT_INCLUDE_DIR}
|
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
|
||||||
${QT_QTGUI_INCLUDE_DIR}
|
|
||||||
${QWT_INCLUDE_DIR}
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
add_definitions(
|
add_definitions(
|
||||||
-DPRINT_LOG #-DVERBOSE
|
-DPRINT_LOG #-DVERBOSE
|
||||||
@ -83,17 +69,22 @@ add_executable(slsDetectorGui
|
|||||||
${RESOURCES_SRCS}
|
${RESOURCES_SRCS}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
target_include_directories(slsDetectorGui PUBLIC
|
||||||
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
|
||||||
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/slsDetectorPlotting/include>"
|
||||||
|
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
|
||||||
|
"$<BUILD_INTERFACE:${QT_INCLUDE_DIR}>"
|
||||||
|
"$<BUILD_INTERFACE:${QT_QTCORE_INCLUDE_DIR}>"
|
||||||
|
"$<BUILD_INTERFACE:${QT_QTGUI_INCLUDE_DIR}>"
|
||||||
|
"$<BUILD_INTERFACE:${QWT_INCLUDE_DIR}>"
|
||||||
|
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
|
||||||
|
)
|
||||||
|
|
||||||
target_link_libraries(slsDetectorGui PUBLIC
|
target_link_libraries(slsDetectorGui PUBLIC
|
||||||
slsProjectOptions
|
|
||||||
slsProjectWarnings
|
|
||||||
slsSupportLib
|
|
||||||
slsDetectorShared
|
slsDetectorShared
|
||||||
${QT_QTCORE_LIBRARIES}
|
${QT_QTCORE_LIBRARIES}
|
||||||
${QT_QTGUI_LIBRARIES}
|
${QT_QTGUI_LIBRARIES}
|
||||||
${QWT_LIBRARIES}
|
${QWT_LIBRARIES}
|
||||||
pthread
|
|
||||||
${ZeroMQ_LIBRARIES}
|
|
||||||
rt
|
|
||||||
png
|
png
|
||||||
z
|
z
|
||||||
Qt4::QtOpenGL
|
Qt4::QtOpenGL
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#include "qDrawPlot.h"
|
#include "qDrawPlot.h"
|
||||||
|
|
||||||
#include "string_utils.h"
|
#include "string_utils.h"
|
||||||
|
#include <cmath>
|
||||||
#include <QStandardItemModel>
|
#include <QStandardItemModel>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user