Merge pull request #94 from SylvainCorlay/update-xtensor

Update to xtensor 0.19
xtensor-stack · Dec 5, 2018 · 910c183 · 910c183
2 parents 3414dd2 + b0d95a8
commit 910c183
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -20,7 +20,7 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install xtensor=0.18.3 -c conda-forge
+  - conda install xtensor=0.19.0 -c conda-forge
   - conda install gtest cmake -c conda-forge
   - conda install m2w64-openblas -c msys2
   # Patch OpenBLASConfig.cmake

diff --git a/.travis.yml b/.travis.yml
@@ -145,7 +145,7 @@ install:
     - conda info -a
     - conda install gtest cmake -c conda-forge
     # Install xtensor and BLAS
-    - conda install xtensor=0.18.3 -c conda-forge
+    - conda install xtensor=0.19.0 -c conda-forge
     - if [[ "$BLAS" == "OpenBLAS" ]]; then
         conda install openblas -c conda-forge;
       elif [[ "$BLAS" == "mkl" ]]; then

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,8 @@ set(XTENSOR_BLAS_INCLUDE_DIR ${INCLUDE_DIR})
 # Configuration
 # =============
 
-# TODO: use the library directory of the found BLAS implementation instead of CMAKE_INSTALL_LIBDIR
+# TODO: use the library directory of the found BLAS implementation instead of
+# CMAKE_INSTALL_LIBDIR
 set(XTENSOR_BLAS_CLING_LIBRARY_DIR_64 "\"${CMAKE_INSTALL_PREFIX}/lib64\"")
 set(XTENSOR_BLAS_CLING_LIBRARY_DIR_32 "\"${CMAKE_INSTALL_PREFIX}/lib32\"")
 set(XTENSOR_BLAS_CLING_LIBRARY_DIR "\"${CMAKE_INSTALL_PREFIX}/lib\"")
@@ -42,7 +43,7 @@ message(STATUS "xtensor-blas v${${PROJECT_NAME}_VERSION}")
 # Dependencies
 # ============
 
-find_package(xtensor REQUIRED)
+find_package(xtensor 0.19 REQUIRED)
 message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xensor")
 
 # Build