Skip to content
Snippets Groups Projects
Commit 9ebe5614 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

Windows build errors (import dll, path to boost in unit tests)

parent 88af16b2
No related branches found
No related tags found
No related merge requests found
......@@ -25,7 +25,7 @@
//! @brief The MultiOption class is intended to store a single option for minimization
//! algorithm. Int, double, string values are available.
//! Relies on boost::variant, will be switched to std::variant in C++-17.
//! (before was https://github.com/mapbox/variant).
//! (before was https://github.com/mapbox/variant.
class BA_CORE_API_ MultiOption
{
......
......@@ -230,5 +230,14 @@ QVector<double> fromStdVector(const std::vector<double> &data)
return result;
}
QStringList fromStdStrings(const std::vector<std::string> &container)
{
QStringList result;
for(std::string str : container) {
result.append(QString::fromStdString(str));
}
return result;
}
} // namespace GUIHelpers
......@@ -69,15 +69,7 @@ BA_CORE_API_ bool isVersionMatchMinimal(const QString &version, const QString &m
BA_CORE_API_ QString currentDateTime();
template<class T>
BA_CORE_API_ QStringList fromStdStrings(const T &container)
{
QStringList result;
for(std::string str : container) {
result.append(QString::fromStdString(str));
}
return result;
}
BA_CORE_API_ QStringList fromStdStrings(const std::vector<std::string> &container);
BA_CORE_API_ QVector<double> fromStdVector(const std::vector<double> &data);
......
......@@ -8,6 +8,7 @@ include_directories(
${BornAgainCore_INCLUDE_DIRS}
${BornAgainFit_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${RootMinimizers_INCLUDE_DIRS}
${gtest_SOURCE_DIR}
${gtest_SOURCE_DIR}/include
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment