From 1463c55c7d519811935559de834ec60d05fdd400 Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Thu, 16 May 2024 16:54:09 +0530 Subject: [PATCH 1/2] Upgraded to latest xeus (3.2.0) --- CMakeLists.txt | 11 +++++++++-- environment-wasm-host.yml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb74f9ca..d0cb1cb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,13 +79,20 @@ endif() # ============ set(xtl_REQUIRED_VERSION 0.7.0) -set(xeus_REQUIRED_VERSION 3.0.5) +set(xeus_REQUIRED_VERSION 3.2.0) if (NOT TARGET xtl) find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED) endif () if (NOT TARGET xeus AND NOT TARGET xeus-static) - find_package(xeus ${xeus_REQUIRED_VERSION} REQUIRED) + find_package(xeus REQUIRED) + if (xeus_FOUND) + if (xeus_VERSION VERSION_LESS xeus_REQUIRED_VERSION) + message(FATAL_ERROR "xeus version must be >= ${xeus_REQUIRED_VERSION}, found: ${xeus_VERSION}") + else () + message(STATUS "Found compatible xeus version: ${xeus_VERSION}") + endif () + endif() endif () set(CppInterOp_REQUIRED_VERSION 1.3.0) diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml index 89cd58cb..37304638 100644 --- a/environment-wasm-host.yml +++ b/environment-wasm-host.yml @@ -5,7 +5,7 @@ channels: dependencies: - nlohmann_json - xeus-lite <2.0 - - xeus >=3.0.5,<4.0 + - xeus >=3.2.0,<4.0 - xtl >=0.7,<0.8 - CppInterOp>=1.3.0 - cpp-argparse From bba7317b9f3173392dca90a4cd8f72aed69b6579 Mon Sep 17 00:00:00 2001 From: anutosh491 Date: Mon, 20 May 2024 11:38:02 +0530 Subject: [PATCH 2/2] Use xeus_REQUIRED_VERSION --- CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0cb1cb3..50d05828 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,13 +85,9 @@ if (NOT TARGET xtl) find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED) endif () if (NOT TARGET xeus AND NOT TARGET xeus-static) - find_package(xeus REQUIRED) + find_package(xeus ${xeus_REQUIRED_VERSION} REQUIRED) if (xeus_FOUND) - if (xeus_VERSION VERSION_LESS xeus_REQUIRED_VERSION) - message(FATAL_ERROR "xeus version must be >= ${xeus_REQUIRED_VERSION}, found: ${xeus_VERSION}") - else () - message(STATUS "Found compatible xeus version: ${xeus_VERSION}") - endif () + message(STATUS "Found compatible xeus version: ${xeus_VERSION}") endif() endif ()