Skip to content

Commit 3fb9904

Browse files
committed
Fixed appveyor build
1 parent d96bff4 commit 3fb9904

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.appveyor.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ install:
2121
- conda config --set always_yes yes --set changeps1 no
2222
- conda update -q conda
2323
- conda info -a
24-
- conda install gtest cmake -c conda-forge
24+
- conda install cmake -c conda-forge
2525
- conda install pytest numpy pybind11==2.4.3 xtensor==0.21.4 -c conda-forge
2626
- "set PYTHONHOME=%MINICONDA%"
27-
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
27+
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe -DDOWNLOAD_GTEST=ON .
2828
- nmake test_xtensor_python
2929
- nmake install
30+
- rmdir /s/q "test/googletest-src"
3031

3132
build_script:
3233
- py.test -s

test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ if (DOWNLOAD_GTEST OR GTEST_SRC_DIR)
6666
message(FATAL_ERROR "Build step for googletest failed: ${result}")
6767
endif()
6868

69+
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
70+
6971
# Add googletest directly to our build. This defines
7072
# the gtest and gtest_main targets.
7173
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src

0 commit comments

Comments
 (0)