This commit is contained in:
Erik Frojdh
2020-02-11 18:41:28 +01:00
parent 73a39fcafe
commit 467be41ccb
3 changed files with 9 additions and 6 deletions

View File

@ -6,7 +6,7 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=install \
-DSLS_USE_TEXTCLIENT=ON \
-DSLS_USE_RECEIVER=ON \
-DSLS_USE_GUI=OFF \
-DSLS_USE_GUI=ON \
-DSLS_USE_TESTS=ON \
-DSLS_USE_PYTHON=ON \
-DCMAKE_BUILD_TYPE=Release \

View File

@ -16,8 +16,8 @@ requirements:
- {{ compiler('c') }}
- {{compiler('cxx')}}
- cmake
# - qwt 6.* #require qt5 investigate before activating gui
# - qt=4.8.7=7
- qwt 6.* #require qt5 investigate before activating gui
- qt=4.8*
- zeromq=4.2.5=hfc679d8_5
- pyzmq
- xorg-libx11
@ -72,7 +72,7 @@ outputs:
run:
- python {{ python }}
- numpy
- slslib=developer
- slslib=udp
test:

View File

@ -1,5 +1,8 @@
set(CMAKE_AUTOMOC ON)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
set(SOURCES
slsDetectorPlotting/src/SlsQt1DPlot.cxx
slsDetectorPlotting/src/SlsQt1DZoomer.cxx
@ -89,8 +92,8 @@ target_link_libraries(slsDetectorGui PUBLIC
${QT_QTCORE_LIBRARIES}
${QT_QTGUI_LIBRARIES}
${QWT_LIBRARIES}
png
z
PNG::PNG
ZLIB::ZLIB
Qt4::QtOpenGL
Qt4::QtSvg
)