diff --git a/CMakeLists.txt b/CMakeLists.txt index d2d0c7098..14f4ecf85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ find_package(Qt4) find_package(Qwt 6) find_package(CBF) find_package(Doxygen) - +find_package(PNG REQUIRED) if (USE_HDF5) find_package(HDF5 1.10 COMPONENTS CXX) diff --git a/RELEASE.txt b/RELEASE.txt index dfbd0d000..b63051c0c 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -52,6 +52,7 @@ If you have any python related questions or comments, please send them to: CONTENTS +- Firmware Requirements - Changes in User Interface - New Features - Resolved Issues @@ -59,6 +60,20 @@ CONTENTS +Firmware Requirements +===================== + + Gotthard + ======== + Minimum compatible version: old one + + Latest version: + 08.02.2018 (50um and 25um Master) + 09.02.2018 (25 um Slave): Solves bugs. + + + + Changes in User Interface ========================= diff --git a/manual/manual-main/slsDetectorInstall.tex b/manual/manual-main/slsDetectorInstall.tex index 9928d21b4..eb57be1d6 100644 --- a/manual/manual-main/slsDetectorInstall.tex +++ b/manual/manual-main/slsDetectorInstall.tex @@ -34,7 +34,7 @@ MYTHEN, GOTTHARD, EIGER and JUNGFRAU.\bigskip detectors, data receivers (to process detector data), and the client (to control or monitor the system). The client and data receivers can be embedded in the user's acquisitions system. Furthermore, the package also provides some -tools for detector calibration.\bigskip +tools for detector calibration. \subsection{Binaries} \noindent The complete software package is composed of several programs which diff --git a/slsDetectorGui/CMakeLists.txt b/slsDetectorGui/CMakeLists.txt index 93742edd6..55c68ca60 100644 --- a/slsDetectorGui/CMakeLists.txt +++ b/slsDetectorGui/CMakeLists.txt @@ -119,7 +119,7 @@ target_link_libraries(slsDetectorGui pthread zmq rt -# png + png z Qt4::QtOpenGL Qt4::QtSvg