Skip to content

Commit

Permalink
"should build, daqlite added to everything target; updates #255"
Browse files Browse the repository at this point in the history
  • Loading branch information
martukas committed Oct 14, 2021
1 parent fe18bf0 commit a8d7e91
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 16 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ if(GTest_FOUND)
all_tests
acquire
daquiri
daqlite
)
create_coverage_targets(
coverage
Expand Down
29 changes: 16 additions & 13 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/5e19e67@ess-dmsc/testing
spdlog/1.3.1@bincrafters/stable
streaming-data-types/6a41aee@ess-dmsc/stable
spdlog/1.3.1@bincrafters/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
6 changes: 3 additions & 3 deletions source/gui/daq/ProjectForm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down

0 comments on commit a8d7e91

Please sign in to comment.