detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into zmqdata

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-09-20 14:42:20 +02:00
commit acb5e50870
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/CMakeLists.txt
View File

@ -1,6 +1,5 @@
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(SOURCES set(SOURCES
slsDetectorPlotting/src/SlsQt1DPlot.cxx slsDetectorPlotting/src/SlsQt1DPlot.cxx
@ -71,6 +70,7 @@ set(HEADERS
set(RESOURCES set(RESOURCES
include/icons.qrc include/icons.qrc
) )
qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
include_directories( include_directories(
include include
@ -97,7 +97,7 @@ add_executable(slsDetectorGui
${SOURCES} ${SOURCES}
${HEADERS} ${HEADERS}
${FORMS_H} ${FORMS_H}
${RESOURCES} ${RESOURCES_SRCS}
) )
set_target_properties(slsDetectorGui PROPERTIES set_target_properties(slsDetectorGui PROPERTIES