From a3f93b6f83c33615c5de798cef00f8637aa93354 Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 31 May 2024 17:43:11 +0200 Subject: [PATCH] Upgraded to xproperty 0.12 and xwidgets 0.29 --- CMakeLists.txt | 4 ++-- environment-dev.yml | 4 ++-- xcanvasConfig.cmake.in | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56e62af..f30fd55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,8 +65,8 @@ option(XCANVAS_BUILD_STATIC_LIBS "Build xcanvas static library (default if BUILD # Dependencies # ============ -set(xproperty_REQUIRED_VERSION 0.11.0) -set(xwidgets_REQUIRED_VERSION 0.27.1) +set(xproperty_REQUIRED_VERSION 0.12.0) +set(xwidgets_REQUIRED_VERSION 0.29.0) if (NOT TARGET xproperty) find_package(xproperty ${xproperty_REQUIRED_VERSION} REQUIRED) diff --git a/environment-dev.yml b/environment-dev.yml index 1de6d34..50fb88d 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -5,8 +5,8 @@ dependencies: - cmake - cxx-compiler - xproperty - - xwidgets >=0.28.1 - - ipycanvas >=0.11.0,<0.12 + - xwidgets >=0.29.0 + - ipycanvas >=0.12.0,<0.13 - pytest - nbval # TODO: replace xeus-cling with xeus(cpp when it is available diff --git a/xcanvasConfig.cmake.in b/xcanvasConfig.cmake.in index 3634c09..251a183 100644 --- a/xcanvasConfig.cmake.in +++ b/xcanvasConfig.cmake.in @@ -18,8 +18,8 @@ @XCANVAS_CONFIG_CODE@ include(CMakeFindDependencyMacro) -find_dependency(xwidgets @xeus_REQUIRED_VERSION@) -find_dependency(xproperty @xeus_REQUIRED_VERSION@) +find_dependency(xwidgets @xwidgets_REQUIRED_VERSION@) +find_dependency(xproperty @xproperty_REQUIRED_VERSION@) if(NOT TARGET xcanvas AND NOT TARGET xcanvas-static) include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")