"updated conan packages and some code to boot; updates #255"

ess-dmsc · Sep 29, 2021 · fe18bf0 · fe18bf0
1 parent 8c9fd26
commit fe18bf0
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 9 deletions.
diff --git a/cmake/CompilerConfig.cmake b/cmake/CompilerConfig.cmake
@@ -1,8 +1,8 @@
 # C++ standard
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 14)
-  set(CMAKE_CXX_STANDARD 14)
+if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17)
+  set(CMAKE_CXX_STANDARD 17)
 endif ()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)

diff --git a/conanfile.txt b/conanfile.txt
@@ -1,12 +1,12 @@
 [requires]
 cli11/1.9.1
-date/27d1e1e@ess-dmsc/stable
+date/2.4.1
 eigen/3.3.9
-fmt/5.2.0@bincrafters/stable
+fmt/6.2.0
 gtest/1.10.0
-h5cpp/0.3.3@ess-dmsc/stable
+h5cpp/0.4.0-dm2@ess-dmsc/stable
 nlohmann_json/3.9.1
-librdkafka/1.6.0
+librdkafka/1.5.0@ess-dmsc/stable
 logical-geometry/705ea61@ess-dmsc/stable
 qplot/2ffc74f@ess-dmsc/stable
 Qt-Color-Widgets/5e19e67@ess-dmsc/testing

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -3,7 +3,7 @@ include(BuildInfo)
 
 find_package(date REQUIRED)
 find_package(fmt REQUIRED)
-find_package(h5cpp 0.1.0 REQUIRED)
+find_package(h5cpp 0.4.0 REQUIRED)
 find_package(Threads REQUIRED)
 add_definitions("-DGRAYLOG")
 

diff --git a/source/consumers/TOF1DCorrelate.h b/source/consumers/TOF1DCorrelate.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <consumers/Spectrum.h>
+#include <deque>
 
 namespace DAQuiri {
 

diff --git a/source/consumers/TOFVal2DCorrelate.h b/source/consumers/TOFVal2DCorrelate.h
@@ -2,6 +2,7 @@
 
 #include <consumers/Spectrum.h>
 #include <consumers/add_ons/ValueLatch.h>
+#include <deque>
 
 namespace DAQuiri
 {

diff --git a/source/core/Project.cpp b/source/core/Project.cpp
@@ -4,6 +4,8 @@
 #include <core/util/h5json.h>
 #include <core/util/ascii_tree.h>
 
+#include <fstream>
+
 #ifdef BUILD_TIME
 #include "build_time.h"
 #endif

diff --git a/source/core/util/logger.h b/source/core/util/logger.h
@@ -15,6 +15,7 @@
 #include <cstdint>
 #include <libgen.h>
 
+#include <cassert> /// Somehow spdlog fails to bring it along on its own
 #include <spdlog/spdlog.h>
 
 #pragma GCC system_header

diff --git a/source/daqlite/CMakeLists.txt b/source/daqlite/CMakeLists.txt
@@ -42,6 +42,6 @@ target_link_libraries(
   PRIVATE RdKafka::rdkafka++
   PRIVATE RdKafka::rdkafka
   QPlot
-  QtColorWidgets-Qt52
+  QtColorWidgets
   Qt5::Widgets
 )
diff --git a/source/daqlite/WorkerThread.h b/source/daqlite/WorkerThread.h
@@ -14,6 +14,7 @@
 
 #include <ESSConsumer.h>
 #include <QThread>
+#include <QMutex>
 #include <iostream>
 
 class WorkerThread : public QThread {

diff --git a/source/gui/CMakeLists.txt b/source/gui/CMakeLists.txt
@@ -60,7 +60,7 @@ target_link_libraries(
   ${PROJECT_NAME}_producers
   ${PROJECT_NAME}_consumers
   QPlot
-  QtColorWidgets-Qt52
+  QtColorWidgets
   Qt5::Widgets
   Qt5::PrintSupport
   Qt5::Network