diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md index 27f6686e..f8bdec5d 100644 --- a/ACKNOWLEDGEMENTS.md +++ b/ACKNOWLEDGEMENTS.md @@ -35,6 +35,7 @@ Supercell Wx uses code from the following dependencies: | [nunicode](https://bitbucket.org/alekseyt/nunicode/src/master/) | [MIT License](https://spdx.org/licenses/MIT.html) | Modified for MapLibre Native | | [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 SQL, Qt SVG, Qt Widgets
Additional Licenses: https://doc.qt.io/qt-6/licenses-used-in-qt.html | +| [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 | | [stb](https://github.com/nothings/stb) | Public Domain | diff --git a/conanfile.py b/conanfile.py index 9f100e2e..d03504b7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -13,6 +13,7 @@ class SupercellWxConan(ConanFile): "libcurl/8.4.0", "libxml2/2.12.2", "openssl/3.2.0", + "re2/20231101", "spdlog/1.12.0", "sqlite3/3.44.2", "vulkan-loader/1.3.243.0", diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index f074d858..25998a11 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -5,6 +5,7 @@ project(scwx-data) find_package(Boost) find_package(cpr) find_package(LibXml2) +find_package(re2) find_package(spdlog) if (NOT MSVC) @@ -268,6 +269,7 @@ target_link_libraries(wxdata PUBLIC aws-cpp-sdk-core aws-cpp-sdk-s3 cpr::cpr LibXml2::LibXml2 + re2::re2 spdlog::spdlog units::units) target_link_libraries(wxdata INTERFACE Boost::iostreams