mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-23 06:50:02 +02:00
Merge branch 'developer' into zmqdata
This commit is contained in:
commit
acb5e50870
@ -1,6 +1,5 @@
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_AUTORCC ON)
|
||||
|
||||
set(SOURCES
|
||||
slsDetectorPlotting/src/SlsQt1DPlot.cxx
|
||||
@ -71,6 +70,7 @@ set(HEADERS
|
||||
set(RESOURCES
|
||||
include/icons.qrc
|
||||
)
|
||||
qt4_add_resources(RESOURCES_SRCS ${RESOURCES})
|
||||
|
||||
include_directories(
|
||||
include
|
||||
@ -97,7 +97,7 @@ add_executable(slsDetectorGui
|
||||
${SOURCES}
|
||||
${HEADERS}
|
||||
${FORMS_H}
|
||||
${RESOURCES}
|
||||
${RESOURCES_SRCS}
|
||||
)
|
||||
|
||||
set_target_properties(slsDetectorGui PROPERTIES
|
||||
|
Loading…
x
Reference in New Issue
Block a user