Merge pull request #245 from JohanMabille/ci

JohanMabille · web-flow · commit c290afb108c1 · 2020-11-27T10:32:58.000+01:00
Fixed Azure Pipelines
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -21,12 +21,13 @@ install:
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a
-  - conda install gtest cmake -c conda-forge
+  - conda install cmake -c conda-forge
   - conda install pytest numpy pybind11==2.4.3 xtensor==0.21.4 -c conda-forge
   - "set PYTHONHOME=%MINICONDA%"
-  - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
+  - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe -DDOWNLOAD_GTEST=ON .
   - nmake test_xtensor_python
   - nmake install
+  - rmdir /s/q "test/googletest-src"
 
 build_script:
   - py.test -s
diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml
@@ -31,4 +31,4 @@ steps:
       source activate xtensor-python
       py.test -s
     displayName: Test xtensor-python (Python)
-    workingDirectory: $(Build.BinariesDirectory)/build
+    workingDirectory: $(Build.SourcesDirectory)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -66,6 +66,8 @@ if (DOWNLOAD_GTEST OR GTEST_SRC_DIR)
         message(FATAL_ERROR "Build step for googletest failed: ${result}")
     endif()
 
+    set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
     # Add googletest directly to our build. This defines
     # the gtest and gtest_main targets.
     add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
