From d392105240a93b699c3db37ee1986e6ecb452c57 Mon Sep 17 00:00:00 2001 From: Thibault Hallouin <thibault.hallouin@inrae.fr> Date: Fri, 14 Apr 2023 18:35:00 +0200 Subject: [PATCH] update required dependency versions --- CMakeLists.txt | 9 ++++++--- environment.yml | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d48ef0..fd0a7c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,10 +27,13 @@ else() #target_include_directories(evalhyd-python SYSTEM PRIVATE "${Python_NumPy_INCLUDE_DIRS}") endif() -find_package(xtensor REQUIRED) +find_package(xtensor 0.7.5 REQUIRED) +message(STATUS "Found xtl: ${xtl_INCLUDE_DIRS}/xtl") + +find_package(xtensor 0.24.6 REQUIRED) message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xtensor") -find_package(xtensor-python REQUIRED) +find_package(xtensor-python 0.26.1 REQUIRED) message(STATUS "Found xtensor-python: ${xtensor-python_INCLUDE_DIRS}/xtensor-python") find_package(pybind11 REQUIRED) @@ -40,7 +43,7 @@ if(DEFINED EVALHYD_SRC) set(EVALHYD_BUILD_TEST OFF CACHE BOOL "configure and compile tests") add_subdirectory(${EVALHYD_SRC} deps/evalhyd) else() - find_package(EvalHyd REQUIRED) + find_package(EvalHyd 0.1.0 REQUIRED) endif() target_link_libraries( diff --git a/environment.yml b/environment.yml index 2e7e612..b09e246 100644 --- a/environment.yml +++ b/environment.yml @@ -11,6 +11,8 @@ dependencies: - python - numpy - pybind11 + - xtl==0.7.5 + - xtensor==0.24.6 - xtensor-python==0.26.1 # - evalhyd-cpp==0.1.0 # Test dependencies -- GitLab