diff --git a/CMakeLists.txt b/CMakeLists.txt index 67c58f083..cbe3e5076 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ if(XTENSOR_USE_TBB AND XTENSOR_USE_OPENMP) endif() if(XTENSOR_USE_XSIMD) - set(xsimd_REQUIRED_VERSION 11.0.0) + set(xsimd_REQUIRED_VERSION 13.2.0) if(TARGET xsimd) set(xsimd_VERSION ${XSIMD_VERSION_MAJOR}.${XSIMD_VERSION_MINOR}.${XSIMD_VERSION_PATCH}) # Note: This is not SEMVER compatible comparison @@ -203,7 +203,6 @@ OPTION(XTENSOR_CHECK_DIMENSION "xtensor dimension check" OFF) OPTION(XTENSOR_FORCE_TEMPORARY_MEMORY_IN_ASSIGNMENTS "xtensor force the use of temporary memory when assigning instead of an automatic overlap check" ON) OPTION(BUILD_TESTS "xtensor test suite" OFF) OPTION(BUILD_BENCHMARK "xtensor benchmark" OFF) -OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF) OPTION(DOWNLOAD_GBENCHMARK "download google benchmark and build from source" ON) OPTION(DEFAULT_COLUMN_MAJOR "set default layout to column major" OFF) OPTION(DISABLE_VS2017 "disables the compilation of some test with Visual Studio 2017" OFF) diff --git a/environment-dev.yml b/environment-dev.yml index acfeaa22d..cc9492bed 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -4,7 +4,7 @@ channels: dependencies: - cmake - xtl=0.7.5 -- xsimd=11.1.0 +- xsimd=13.2.0 - nlohmann_json - doctest=2.4.7 - pre-commit