Merge pull request #14 from JohanMabille/xtl

Removed dependency on xtl
jupyter-xeus · May 30, 2024 · 83e222f · 83e222f
2 parents 9a20c36 + 79b23bb
commit 83e222f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git 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)
                                                $<INSTALL_INTERFACE:include>)
 
     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
@@ -19,8 +19,6 @@
 #include <utility>
 #include <vector>
 
-#include "xtl/xoptional.hpp"
-
 #include "nlohmann/json.hpp"
 
 #include "xwidgets/xcolor.hpp"

diff --git 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@)