From 68e69e1fcf295936f8fb79db78255657212342de Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:17:53 +0000 Subject: [PATCH] Upgrade to use CppInterOp 1.5.0 minimum so that version should work for wasm builds --- CMakeLists.txt | 2 +- README.md | 2 +- environment-dev.yml | 2 +- environment-wasm-host.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31ab854a..249ad8c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ endif() set(xeus_REQUIRED_VERSION 5.0.0) set(xeus_zmq_REQUIRED_VERSION 3.0.0) -set(CppInterOp_REQUIRED_VERSION 1.4.0) +set(CppInterOp_REQUIRED_VERSION 1.5.0) if (NOT TARGET xeus AND NOT TARGET xeus-static) find_package(xeus ${xeus_REQUIRED_VERSION} REQUIRED) diff --git a/README.md b/README.md index 3c291979..dffc57e6 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ http://xeus-cpp.readthedocs.io | `xeus-cpp` | `xeus-zmq` | `CppInterOp` | `pugixml` | `cpp-argparse`| `nlohmann_json` | |------------|-----------------|--------------|-----------|---------------|-----------------| -| main | >=3.0.0,<4.0.0 | >=1.4.0 | ~1.8.1 | <3.1 | >=3.11.3,<4.0 | +| main | >=3.0.0,<4.0.0 | >=1.5.0 | ~1.8.1 | <3.1 | >=3.11.3,<4.0 | | 0.5.0 | >=3.0.0,<4.0.0 | >=1.3.0 | ~1.8.1 | <3.1 | >=3.11.3,<4.0 | Versions prior to `0.5.0` have an additional dependency on [xtl](https://github.com/xtensor-stack/xtl), [clang](https://github.com/llvm/llvm-project/) & [cppzmq](https://github.com/zeromq/cppzmq) diff --git a/environment-dev.yml b/environment-dev.yml index fb3901d8..256679a9 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -10,7 +10,7 @@ dependencies: - xeus>=5.0.0 - xeus-zmq>=3.0,<4.0 - nlohmann_json=3.11.3 - - CppInterOp>=1.4.0 + - CppInterOp>=1.5.0 - pugixml - cpp-argparse <3.1 - zlib diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml index 152df9e9..9167a746 100644 --- a/environment-wasm-host.yml +++ b/environment-wasm-host.yml @@ -6,6 +6,6 @@ dependencies: - nlohmann_json - xeus-lite - xeus - - CppInterOp>=1.4.0 + - CppInterOp>=1.5.0 - cpp-argparse - pugixml \ No newline at end of file