diff options
| author | Roger Leigh <rleigh@codelibre.net> | 2021-02-01 23:06:01 +0000 |
|---|---|---|
| committer | Roger Leigh <rleigh@codelibre.net> | 2021-02-01 23:06:01 +0000 |
| commit | 643480de3e08b39f17d9a5ae20baacb646cb9044 (patch) | |
| tree | 47c74ba226ec59617d49fded7340157c92da00fe | |
| parent | ff1299bb4ac915e12ce7ce98b5101891c78942a5 (diff) | |
| parent | fd6306a13a4cd85b48a7832399747085f363d6af (diff) | |
| download | libtiff-git-643480de3e08b39f17d9a5ae20baacb646cb9044.tar.gz | |
Merge branch 'ci-32-bit' into 'master'
ci: Build 32- and 64-bit MSVC variants
See merge request libtiff/libtiff!218
| -rw-r--r-- | .appveyor.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 04369ec6..28defae6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,10 +24,12 @@ environment: shared: OFF - compiler: vc14-cmake configuration: Release + arch: x64 generator: Visual Studio 16 2019 shared: ON - compiler: vc14-cmake configuration: Debug + arch: Win32 generator: Visual Studio 16 2019 shared: OFF - compiler: vc14-nmake @@ -74,7 +76,7 @@ before_build: - if NOT %compiler%==vc14-nmake echo Running cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_TIFF_CMAKE_SOURCE% - 'if %compiler%==cygwin-cmake bash -c "cmake -G \"%generator%\" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%"' - 'if %compiler%==mingw-cmake cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%' - - 'if %compiler%==vc14-cmake cmake -G "%generator%" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%' + - 'if %compiler%==vc14-cmake cmake -G "%generator%" -A %arch% -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%' build_script: - if NOT %compiler%==vc14-nmake cd %AV_TIFF_BUILD% |