Merge branch 'gui' of github.com:slsdetectorgroup/slsDetectorPackage into gui

CMakeLists.txt

@@ -125,8 +125,8 @@ install(TARGETS slsProjectOptions slsProjectWarnings rapidjson
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_INSTALL_RPATH "$ORIGIN")
-set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-
+# set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
 
 find_package(Doxygen)

slsDetectorGui/CMakeLists.txt

@@ -51,26 +51,12 @@ set(HEADERS
     include/qTabDebugging.h
     include/qTabDeveloper.h
     include/qTabMessages.h
-    ../slsDetectorSoftware/include
-    ../slsSupportLib/include/versionAPI.h
-    ../slsSupportLib/include/ServerSocket.h
-    ../slsSupportLib/include/ServerInterface2.h
 )
 set(RESOURCES
     include/icons.qrc
 )
 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(
     -DPRINT_LOG #-DVERBOSE 
@@ -83,16 +69,22 @@ add_executable(slsDetectorGui
     ${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
-    slsProjectOptions
-    slsProjectWarnings
-    slsSupportLib
     slsDetectorShared
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTGUI_LIBRARIES}
     ${QWT_LIBRARIES}
-    ${ZeroMQ_LIBRARIES}
-    rt
     png
     z
     Qt4::QtOpenGL
@@ -103,4 +95,11 @@ set_target_properties(slsDetectorGui PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
 )
 
-install(TARGETS slsDetectorGui DESTINATION bin)
+install(TARGETS slsDetectorGui
+    EXPORT "${TARGETS_EXPORT_NAME}"
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+

slsDetectorGui/src/qTabMeasurement.cpp

@@ -3,7 +3,7 @@
 #include "qDrawPlot.h"
 
 #include "string_utils.h"
-
+#include <cmath>
 #include <QStandardItemModel>
 #include <QTimer>