diff --git a/CMakeLists.txt b/CMakeLists.txt index cedc41eae07..f76650dce79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,6 +119,7 @@ endif() find_package(nudb REQUIRED) find_package(date REQUIRED) +find_package(wasm-xrplf REQUIRED) find_package(xxHash REQUIRED) target_link_libraries(xrpl_libs INTERFACE diff --git a/cmake/XrplCore.cmake b/cmake/XrplCore.cmake index 164fc8523fa..ce1e92bcc1e 100644 --- a/cmake/XrplCore.cmake +++ b/cmake/XrplCore.cmake @@ -63,11 +63,16 @@ target_link_libraries(xrpl.imports.main Xrpl::opts Xrpl::syslibs secp256k1::secp256k1 + wasm-xrplf::wasm-xrplf xrpl.libpb xxHash::xxhash $<$:antithesis-sdk-cpp> ) +if (WIN32) + target_link_libraries(xrpl.imports.main INTERFACE ntdll) +endif() + include(add_module) include(target_link_modules) diff --git a/conan.lock b/conan.lock index cb257774234..82f2e939aff 100644 --- a/conan.lock +++ b/conan.lock @@ -3,6 +3,7 @@ "requires": [ "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497", "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1756234289.683", + "wasm-xrplf/2.4.1-xrplf#dc67c558e283593ef0edd7eb00e9fa0d%1759862247.891", "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1756234266.869", "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1756234262.318", "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1756234314.246", diff --git a/conanfile.py b/conanfile.py index 7f8ab24fbd1..5a24ac1988d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -2,6 +2,7 @@ from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout import re + class Xrpl(ConanFile): name = 'xrpl' @@ -29,6 +30,7 @@ class Xrpl(ConanFile): 'nudb/2.0.9', 'openssl/3.5.4', 'soci/4.0.3', + 'wasm-xrplf/2.4.1-xrplf', 'zlib/1.3.1', ] @@ -133,6 +135,7 @@ def layout(self): self.folders.generators = 'build/generators' generators = 'CMakeDeps' + def generate(self): tc = CMakeToolchain(self) tc.variables['tests'] = self.options.tests @@ -190,6 +193,7 @@ def package_info(self): 'protobuf::libprotobuf', 'soci::soci', 'sqlite3::sqlite', + 'wasm-xrplf::wasm-xrplf', 'xxhash::xxhash', 'zlib::zlib', ]