From 79b23bbdd29e856c6e7bc729b7e136884a60701b Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Thu, 30 May 2024 15:58:18 +0200 Subject: [PATCH] Removed dependency on xtl --- CMakeLists.txt | 6 ------ include/xcanvas/xcanvas.hpp | 2 -- xcanvasConfig.cmake.in | 1 - 3 files changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ad9258..56e62af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,14 +65,9 @@ option(XCANVAS_BUILD_STATIC_LIBS "Build xcanvas static library (default if BUILD # Dependencies # ============ -set(xtl_REQUIRED_VERSION 0.7.0) set(xproperty_REQUIRED_VERSION 0.11.0) set(xwidgets_REQUIRED_VERSION 0.27.1) -if (NOT TARGET xtl) - find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED) -endif () - if (NOT TARGET xproperty) find_package(xproperty ${xproperty_REQUIRED_VERSION} REQUIRED) endif () @@ -120,7 +115,6 @@ macro(xcanvas_create_target target_name linkage output_name) $) target_link_libraries(${target_name} - PUBLIC xtl PUBLIC xproperty PUBLIC ${XWIDGETS_TARGET_NAME}) diff --git a/include/xcanvas/xcanvas.hpp b/include/xcanvas/xcanvas.hpp index 713732a..7aac433 100644 --- a/include/xcanvas/xcanvas.hpp +++ b/include/xcanvas/xcanvas.hpp @@ -19,8 +19,6 @@ #include #include -#include "xtl/xoptional.hpp" - #include "nlohmann/json.hpp" #include "xwidgets/xcolor.hpp" diff --git a/xcanvasConfig.cmake.in b/xcanvasConfig.cmake.in index bb5d8d0..3634c09 100644 --- a/xcanvasConfig.cmake.in +++ b/xcanvasConfig.cmake.in @@ -18,7 +18,6 @@ @XCANVAS_CONFIG_CODE@ include(CMakeFindDependencyMacro) -find_dependency(xtl @xtl_REQUIRED_VERSION@) find_dependency(xwidgets @xeus_REQUIRED_VERSION@) find_dependency(xproperty @xeus_REQUIRED_VERSION@)