Skip to content

Commit 7e7b9df

Browse files
committed
Fix appveyor tests
1 parent 2bdf33f commit 7e7b9df

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

appveyor.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
version: '{build}'
22

3-
# Uncomment this to enable the fast build environment if your account does not
4-
# support it automatically:
5-
#os: Visual Studio 2015 RC
3+
image: Visual Studio 2019
64

75
environment:
86
global:
@@ -16,7 +14,6 @@ environment:
1614
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
1715
WITH_MPFR: yes
1816
WITH_MPC: yes
19-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
2017
- BUILD_TYPE: "Release"
2118
COMPILER: MSVC15
2219
PLATFORM: "x64"
@@ -45,7 +42,6 @@ environment:
4542
PLATFORM: "x64"
4643
PYTHON_VERSION: 310-x64
4744
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
48-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
4945
WITH_MPFR: yes
5046
WITH_MPC: yes
5147
WITH_LLVM: yes
@@ -103,15 +99,16 @@ install:
10399
- if [%COMPILER%]==[MinGW] set "CMAKE_GENERATOR=MinGW Makefiles"
104100
- if [%COMPILER%]==[MinGW-w64] set "CMAKE_GENERATOR=MinGW Makefiles"
105101

106-
- if [%COMPILER%]==[MSVC15] cmake -DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\Library ..
107-
- if [%COMPILER%]==[MinGW] cmake -DCMAKE_PREFIX_PATH=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
108-
- if [%COMPILER%]==[MinGW-w64] cmake -DCMAKE_PREFIX_PATH=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
102+
- if [%COMPILER%]==[MSVC15] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\\Library"
103+
- if [%COMPILER%]==[MinGW] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE%"
104+
- if [%COMPILER%]==[MinGW-w64] set "CMAKE_ARGS=-DCMAKE_PREFIX_PATH=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE%"
109105

110-
- if [%WITH_MPFR%]==[yes] cmake -DWITH_MPFR=yes ..
111-
- if [%WITH_MPC%]==[yes] cmake -DWITH_MPC=yes ..
112-
- if [%WITH_LLVM%]==[yes] cmake -DWITH_LLVM=yes -DMSVC_USE_MT=no ..
106+
- if [%WITH_MPFR%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_MPFR=yes"
107+
- if [%WITH_MPC%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_MPC=yes"
108+
- if [%WITH_LLVM%]==[yes] set "CMAKE_ARGS=%CMAKE_ARGS% -DWITH_LLVM=yes -DMSVC_USE_MT=no"
113109

114-
- cmake -DBUILD_SHARED_LIBS=yes -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no -DCMAKE_INSTALL_PREFIX=C:\symengine ..
110+
- echo "CMAKE_ARGS: %CMAKE_ARGS%"
111+
- cmake %CMAKE_ARGS% -DBUILD_SHARED_LIBS=yes -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no -DCMAKE_INSTALL_PREFIX=C:\symengine ..
115112

116113
- cmake --build . --config %BUILD_TYPE% --target install
117114
- cd ../../

0 commit comments

Comments
 (0)