diff --git a/CMakeLists.txt b/CMakeLists.txt index ca386774..1b50104d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ if(GTest_FOUND) all_tests acquire daquiri + daqlite ) create_coverage_targets( coverage diff --git a/conanfile.txt b/conanfile.txt index 85f66466..e7d044f7 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -2,32 +2,35 @@ cli11/1.9.1 date/2.4.1 eigen/3.3.9 -fmt/6.2.0 gtest/1.10.0 h5cpp/0.4.0-dm2@ess-dmsc/stable nlohmann_json/3.9.1 -librdkafka/1.5.0@ess-dmsc/stable +librdkafka/1.6.0 logical-geometry/705ea61@ess-dmsc/stable qplot/2ffc74f@ess-dmsc/stable Qt-Color-Widgets/a95f72e@ess-dmsc/stable spdlog/1.8.5 streaming-data-types/6a41aee@ess-dmsc/stable +fmt/5.3.0@bincrafters/stable [generators] cmake -virtualrunenv cmake_find_package +virtualbuildenv +virtualrunenv [options] gtest:shared=False -librdkafka:shared=False +librdkafka:shared=True +flatbuffers:shared=True +hdf5:shared=True +date:use_system_tz_db=True +h5cpp:with_boost=False [imports] -bin, cmake -> ./bin -bin, *.dll -> ./bin -lib, *.dll -> ./bin -lib, *.so.* -> ./lib -lib, *.so -> ./lib -share, * -> ./share -filesystem/lib, *.so* -> ./lib -system/lib, *.so* -> ./lib +., *.dylib* -> ./lib @ keep_path=False +., *.so* -> ./lib @ keep_path=False +., LICENSE* -> ./licenses @ folder=True, ignore_case=True +., *.dll -> ./bin @ keep_path=False +., *.a* -> ./lib @ keep_path=False +., *.lib -> -> ./bin @ keep_path=False diff --git a/source/gui/daq/ProjectForm.cpp b/source/gui/daq/ProjectForm.cpp index 7f3d9886..5544ee40 100644 --- a/source/gui/daq/ProjectForm.cpp +++ b/source/gui/daq/ProjectForm.cpp @@ -348,10 +348,10 @@ void ProjectForm::save() if (project_identity_.isEmpty() || !project_->changed()) return; - boost::filesystem::path path(project_identity_.toStdString()); - if (!boost::filesystem::exists(path) || !hdf5::file::is_hdf5_file(path)) + std::filesystem::path path(project_identity_.toStdString()); + if (!std::filesystem::exists(path) || !hdf5::file::is_hdf5_file(path)) { - path = boost::filesystem::path(data_directory_.toStdString()) + path = std::filesystem::path(data_directory_.toStdString()) / (project_identity_.toStdString() + ".daq"); }