From 707601832f3dacba6883eedb164be86ac96cf732 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Tue, 3 Nov 2020 08:44:29 +0100 Subject: [PATCH] minor fix to build --- ctbGui/ctbAcquisition.cpp | 1 + slsDetectorCalibration/moenchExecutables/CMakeLists.txt | 2 +- slsDetectorCalibration/tiffIO.h | 2 +- slsDetectorSoftware/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ctbGui/ctbAcquisition.cpp b/ctbGui/ctbAcquisition.cpp index e2968ca4b..d719802ff 100755 --- a/ctbGui/ctbAcquisition.cpp +++ b/ctbGui/ctbAcquisition.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include diff --git a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt index e6d4577e1..64204de1f 100644 --- a/slsDetectorCalibration/moenchExecutables/CMakeLists.txt +++ b/slsDetectorCalibration/moenchExecutables/CMakeLists.txt @@ -27,7 +27,7 @@ foreach(exe ${MOENCH_EXECUTABLES}) slsSupportShared ${ZeroMQ_LIBRARIES} pthread - tiff + TIFF::TIFF PRIVATE slsProjectWarnings diff --git a/slsDetectorCalibration/tiffIO.h b/slsDetectorCalibration/tiffIO.h index b27fdd938..a248e367f 100644 --- a/slsDetectorCalibration/tiffIO.h +++ b/slsDetectorCalibration/tiffIO.h @@ -16,7 +16,7 @@ //CBFlib must be installed to use this program // /*****************************************************************************/ -#include "tiffio.h" +#include #undef cbf_failnez #define cbf_failnez(x) \ diff --git a/slsDetectorSoftware/CMakeLists.txt b/slsDetectorSoftware/CMakeLists.txt index 571b6dcfb..cce46cafb 100755 --- a/slsDetectorSoftware/CMakeLists.txt +++ b/slsDetectorSoftware/CMakeLists.txt @@ -68,7 +68,7 @@ foreach(val RANGE ${len2}) target_link_libraries(${val1} slsDetectorShared pthread - zmq + ${ZeroMQ_LIBRARIES} rt ) set_target_properties(${val1} PROPERTIES