Merge pull request #38 from JohanMabille/xtensor_012

Moved to xtensor 0.12.0
xtensor-stack · Oct 4, 2017 · d0c08a4 · d0c08a4
2 parents cf69a8f + b047daf
commit d0c08a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -21,7 +21,7 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install xtensor=0.11.0 -c conda-forge
+  - conda install xtensor=0.12.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
@@ -124,7 +124,7 @@ install:
     - conda info -a
     - conda install gtest cmake -c conda-forge
     # Install xtensor and BLAS
-    - conda install xtensor=0.11.0 -c conda-forge
+    - conda install xtensor=0.12.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
@@ -27,6 +27,12 @@ set(${PROJECT_NAME}_VERSION
     ${XTENSOR_BLAS_VERSION_MAJOR}.${XTENSOR_BLAS_VERSION_MINOR}.${XTENSOR_BLAS_VERSION_PATCH})
 message(STATUS "xtensor-blas v${${PROJECT_NAME}_VERSION}")
 
+# Dependencies
+# ============
+
+find_package(xtensor REQUIRED)
+message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xensor")
+
 # Build
 # =====
 
@@ -58,7 +64,6 @@ endif()
 
 if(BUILD_TESTS)
     include_directories(${XTENSOR_BLAS_INCLUDE_DIR})
-    find_package(xtensor REQUIRED)
     include_directories(${xtensor_INCLUDE_DIRS})
     add_subdirectory(test)
 endif()