Skip to content

Fixed Azure Pipelines #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohanMabille merged 2 commits into from
Nov 27, 2020
Merged

Fixed Azure Pipelines #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d96bff4
Fixed Azure Pipelines
JohanMabille Nov 27, 2020
3fb9904
Fixed appveyor build
JohanMabille Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/unix-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ steps:
source activate xtensor-python
py.test -s
displayName: Test xtensor-python (Python)
workingDirectory: $(Build.BinariesDirectory)/build
workingDirectory: $(Build.SourcesDirectory)
2 changes: 2 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down