diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md index 4aec61d2..6f7cd4ef 100644 --- a/ACKNOWLEDGEMENTS.md +++ b/ACKNOWLEDGEMENTS.md @@ -36,6 +36,7 @@ Supercell Wx uses code from the following dependencies: | [OpenSSL](https://www.openssl.org/) | [OpenSSL License](https://spdx.org/licenses/OpenSSL.html) | | [Qt](https://www.qt.io/) | [GNU Lesser General Public License v3.0 only](https://spdx.org/licenses/LGPL-3.0-only.html) | Qt Core, Qt GUI, Qt Multimedia, Qt Network, Qt OpenGL, Qt Positioning, Qt Serial Port, Qt SQL, Qt SVG, Qt Widgets
Additional Licenses: https://doc.qt.io/qt-6/licenses-used-in-qt.html | | [qt6ct](https://github.com/trialuser02/qt6ct) | [BSD 2-Clause "Simplified" License](https://spdx.org/licenses/BSD-2-Clause.html) | +| [range-v3](https://github.com/ericniebler/range-v3) | [Boost Software License 1.0](https://spdx.org/licenses/BSL-1.0.html)
[MIT License](https://spdx.org/licenses/MIT.html)
[Stepanov and McJones, "Elements of Programming" license](https://github.com/ericniebler/range-v3/tree/0.12.0?tab=License-1-ov-file)
[SGI C++ Standard Template Library license](https://github.com/ericniebler/range-v3/tree/0.12.0?tab=License-1-ov-file) | | [re2](https://github.com/google/re2) | [BSD 3-Clause "New" or "Revised" License](https://spdx.org/licenses/BSD-3-Clause.html) | | [spdlog](https://github.com/gabime/spdlog) | [MIT License](https://spdx.org/licenses/MIT.html) | | [SQLite](https://www.sqlite.org/) | Public Domain | diff --git a/conanfile.py b/conanfile.py index e68c9f39..ea9c6ab9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -18,6 +18,7 @@ class SupercellWxConan(ConanFile): "libpng/1.6.47", "libxml2/2.13.6", "openssl/3.4.1", + "range-v3/0.12.0", "re2/20240702", "spdlog/1.15.1", "sqlite3/3.49.1", diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index 468f124b..32db05ab 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -6,6 +6,7 @@ find_package(Boost) find_package(cpr) find_package(LibXml2) find_package(OpenSSL) +find_package(range-v3) find_package(re2) find_package(spdlog) @@ -303,6 +304,7 @@ target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core cpr::cpr LibXml2::LibXml2 OpenSSL::Crypto + range-v3::range-v3 re2::re2 spdlog::spdlog units::units)