Removed dependency on xtl

CMakeLists.txt

@@ -25,13 +25,6 @@ set(${PROJECT_NAME}_VERSION
     ${XPROPERTY_VERSION_MAJOR}.${XPROPERTY_VERSION_MINOR}.${XPROPERTY_VERSION_PATCH})
 message(STATUS "xproperty v${${PROJECT_NAME}_VERSION}")
 
-# Dependencies
-# ============
-
-set(xtl_REQUIRED_VERSION 0.7.0)
-find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
-message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl")
-
 # Build
 # =====
 
@@ -45,8 +38,6 @@ set(XPROPERTY_HEADERS
 add_library(xproperty INTERFACE)
 target_include_directories(xproperty INTERFACE $<BUILD_INTERFACE:${XPROPERTY_INCLUDE_DIR}>
                                                $<INSTALL_INTERFACE:include>)
-target_link_libraries(xproperty INTERFACE xtl)
-
 OPTION(BUILD_TESTS "xproperty test suite" OFF)
 
 if(BUILD_TESTS)

README.md

@@ -51,11 +51,12 @@ http://xproperty.readthedocs.io/
 
 ## Dependencies
 
-`xproperty` depends on the [xtl](https://github.com/xtensor-stack/xtl) library.
+`xproperty` depends on [nlohmann_json](https://github.com/nlohmann/json).
+
+Versions prior to 0.12.0, also depend on the [xtl](https://github.com/xtensor-stack/xtl) library.
 
 | `xproperty` |     `xtl`     |
 |-------------|---------------|
-|   master    | >=0.7.0,<0.8  |
 |   0.11.0    | >=0.7.0,<0.8  |
 |   0.10.4    | >=0.6.11,<0.7 |
 |   0.10.3    | >=0.6.11,<0.7 |

environment-dev.yml

@@ -7,7 +7,6 @@ dependencies:
   - cxx-compiler
   - ninja
   # Host dependencies
-  - xtl=0.7.0
   - nlohmann_json
   - doctest
 

include/xproperty/xobserved.hpp

@@ -9,14 +9,13 @@
 #ifndef XOBSERVED_HPP
 #define XOBSERVED_HPP
 
+#include <any>
 #include <cstddef>
 #include <functional>
 #include <type_traits>
 #include <map>
 #include <vector>
 
-#include "xtl/xany.hpp"
-
 #include "xproperty.hpp"
 
 namespace xp
@@ -97,7 +96,7 @@ namespace xp
 
     private:
 
-        std::map<const char*, std::tuple<std::vector<xtl::any>, std::vector<std::function<void(derived_type&)>>>> m_accesses;
+        std::map<const char*, std::tuple<std::vector<std::any>, std::vector<std::function<void(derived_type&)>>>> m_accesses;
 
         template <class X, class Y>
         friend class xproperty;
@@ -179,7 +178,7 @@ namespace xp
 
         for(auto& validator : std::get<0>(m_accesses[name]))
         {
-            xtl::any_cast<std::function<void(derived_type&, value_type&)>>(validator)(derived_cast(), value);
+            std::any_cast<std::function<void(derived_type&, value_type&)>>(validator)(derived_cast(), value);
         }
 
         return value;

include/xproperty/xproperty.hpp

@@ -13,8 +13,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "xtl/xfunctional.hpp"
-
 namespace xp
 {
 

test/CMakeLists.txt

@@ -12,7 +12,6 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     project(xproperty-test)
 
     find_package(xproperty REQUIRED CONFIG)
-    find_package(xtl REQUIRED CONFIG)
     set(XPROPERTY_INCLUDE_DIR ${xproperty_INCLUDE_DIRS})
 endif ()
 
@@ -23,26 +22,6 @@ include(CheckCXXCompilerFlag)
 
 string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR (CMAKE_CXX_COMPILER_ID MATCHES "Intel" AND NOT WIN32))
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion -Wsign-conversion")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast -Wunused-variable")
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion")
-    CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG)
-    CHECK_CXX_COMPILER_FLAG("-std=c++17" HAS_CPP17_FLAG)
-
-    if (CPP17 AND HAS_CPP17_FLAG)
-        set(CMAKE_CXX_STANDARD 17)
-        message(STATUS "Building with -std=c++17")
-    elseif (HAS_CPP14_FLAG)
-        set(CMAKE_CXX_STANDARD 14)
-        message(STATUS "Building with -std=c++14")
-    else()
-        message(FATAL_ERROR "Unsupported compiler -- xproperty requires C++14 support!")
-    endif()
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-    set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
-
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
     add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
@@ -62,7 +41,8 @@ set(XPROPERTY_TESTS
 )
 
 add_executable(test_xproperty ${XPROPERTY_TESTS} ${XPROPERTY_HEADERS})
+target_compile_features(test_xproperty PRIVATE cxx_std_17)
 target_include_directories(test_xproperty PRIVATE ${XPROPERTY_INCLUDE_DIR})
-target_link_libraries(test_xproperty PRIVATE xtl doctest::doctest Threads::Threads)
+target_link_libraries(test_xproperty PRIVATE doctest::doctest Threads::Threads)
 
 add_custom_target(xtest COMMAND test_xproperty DEPENDS test_xproperty)

xpropertyConfig.cmake.in

@@ -15,9 +15,6 @@
 
 @PACKAGE_INIT@
 
-include(CMakeFindDependencyMacro)
-find_dependency(xtl @xtl_REQUIRED_VERSION@)
-
 if(NOT TARGET @PROJECT_NAME@)
     include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
     get_target_property(@PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@ INTERFACE_INCLUDE_DIRECTORIES)