From f846cd6452cf40bab084939aad812e8da5131c18 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 09:01:47 +0100 Subject: [PATCH 01/14] test-appveyor --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index bcc0d1a0..49c76a3f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -57,6 +57,8 @@ before_build: - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\cygwin64\bin\cygpath -u %AV_TIFF_INSTALL%`) DO SET AV_TIFF_CYG_INSTALL=%%F' - 'if %compiler%==cygwin-cmake C:\Cygwin64\setup-x86_64 -q -R C:\Cygwin64 -s http://cygwin.mirror.constant.com -l %AV_TIFF_DOWNLOAD%\cygwin -P cmake,libjpeg-devel,zlib-devel' - 'if %compiler%==cygwin-cmake set "PATH=C:\Cygwin64\bin;%PATH%"' + - 'if %compiler%==cygwin-cmake dir "C:\Cygwin64\bin"' + - set - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' From 04b299927f0e357e5beb50cd80a6804e3b2fdbb6 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 09:10:07 +0100 Subject: [PATCH 02/14] Update AppVeyor image --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 49c76a3f..c8e7370c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,7 +41,7 @@ cache: - 'c:\projects\download -> appveyor.yml' # Operating system (build VM template) -os: 'Visual Studio 2015' +os: 'Visual Studio 2017' # clone directory clone_folder: 'c:\projects\libtiff' From 9555de026e78c3c3b6af0cab6da9e9444dba7734 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 09:33:47 +0100 Subject: [PATCH 03/14] wip --- .appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c8e7370c..aab81167 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -58,6 +58,9 @@ before_build: - 'if %compiler%==cygwin-cmake C:\Cygwin64\setup-x86_64 -q -R C:\Cygwin64 -s http://cygwin.mirror.constant.com -l %AV_TIFF_DOWNLOAD%\cygwin -P cmake,libjpeg-devel,zlib-devel' - 'if %compiler%==cygwin-cmake set "PATH=C:\Cygwin64\bin;%PATH%"' - 'if %compiler%==cygwin-cmake dir "C:\Cygwin64\bin"' + - 'if %compiler%==cygwin-cmake cygpath --version || echo cygpath not found"' + - 'if %compiler%==cygwin-cmake cmake --version || echo CMake not found"' + - 'if %compiler%==cygwin-cmake C:\cygwin64\bin\cmake --version || echo CMake not found"' - set - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" From 5d0476eb0bcc44440bc271a474f9d99214b85a7b Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 09:43:43 +0100 Subject: [PATCH 04/14] wip --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index aab81167..8c45b42a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -53,15 +53,15 @@ init: - git config --global core.autocrlf input before_build: - - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\cygwin64\bin\cygpath -u %AV_TIFF_SOURCE%`) DO SET AV_TIFF_CYG_SOURCE=%%F' - - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\cygwin64\bin\cygpath -u %AV_TIFF_INSTALL%`) DO SET AV_TIFF_CYG_INSTALL=%%F' + - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\Cygwin64\bin\cygpath -u %AV_TIFF_SOURCE%`) DO SET AV_TIFF_CYG_SOURCE=%%F' + - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\Cygwin64\bin\cygpath -u %AV_TIFF_INSTALL%`) DO SET AV_TIFF_CYG_INSTALL=%%F' - 'if %compiler%==cygwin-cmake C:\Cygwin64\setup-x86_64 -q -R C:\Cygwin64 -s http://cygwin.mirror.constant.com -l %AV_TIFF_DOWNLOAD%\cygwin -P cmake,libjpeg-devel,zlib-devel' - 'if %compiler%==cygwin-cmake set "PATH=C:\Cygwin64\bin;%PATH%"' + - set - 'if %compiler%==cygwin-cmake dir "C:\Cygwin64\bin"' + - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake --version || echo CMake not found"' - 'if %compiler%==cygwin-cmake cygpath --version || echo cygpath not found"' - 'if %compiler%==cygwin-cmake cmake --version || echo CMake not found"' - - 'if %compiler%==cygwin-cmake C:\cygwin64\bin\cmake --version || echo CMake not found"' - - set - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' From 3b522bf470cca1c5cbd9c3fbf01be275f5fcec55 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 09:57:15 +0100 Subject: [PATCH 05/14] wip --- .appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8c45b42a..5a11e89b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -58,7 +58,9 @@ before_build: - 'if %compiler%==cygwin-cmake C:\Cygwin64\setup-x86_64 -q -R C:\Cygwin64 -s http://cygwin.mirror.constant.com -l %AV_TIFF_DOWNLOAD%\cygwin -P cmake,libjpeg-devel,zlib-devel' - 'if %compiler%==cygwin-cmake set "PATH=C:\Cygwin64\bin;%PATH%"' - set - - 'if %compiler%==cygwin-cmake dir "C:\Cygwin64\bin"' + - 'if %compiler%==cygwin-cmake dir C:\Cygwin64\bin' + - 'if %compiler%==cygwin-cmake dir C:\Cygwin64\bin\cmake.exe' + - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake.exe --version || echo CMake not found"' - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake --version || echo CMake not found"' - 'if %compiler%==cygwin-cmake cygpath --version || echo cygpath not found"' - 'if %compiler%==cygwin-cmake cmake --version || echo CMake not found"' From 5123e2928742e8a122c1f098126449fc23db1dac Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 10:12:02 +0100 Subject: [PATCH 06/14] wip --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5a11e89b..3bacfc30 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -38,7 +38,7 @@ environment: shared: ON cache: - - 'c:\projects\download -> appveyor.yml' + #- 'c:\projects\download -> appveyor.yml' # Operating system (build VM template) os: 'Visual Studio 2017' From e8863893b0f5d9938b893c85bd5ee30b0a0dd02d Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 10:47:23 +0100 Subject: [PATCH 07/14] wip --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3bacfc30..12bad2c4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -60,10 +60,10 @@ before_build: - set - 'if %compiler%==cygwin-cmake dir C:\Cygwin64\bin' - 'if %compiler%==cygwin-cmake dir C:\Cygwin64\bin\cmake.exe' - - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake.exe --version || echo CMake not found"' - - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake --version || echo CMake not found"' - - 'if %compiler%==cygwin-cmake cygpath --version || echo cygpath not found"' - - 'if %compiler%==cygwin-cmake cmake --version || echo CMake not found"' + - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake.exe --version || echo CMake not found' + - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake --version || echo CMake not found' + - 'if %compiler%==cygwin-cmake cygpath --version || echo cygpath not found' + - 'if %compiler%==cygwin-cmake cmake --version || echo CMake not found' - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' From 6d078fe1f81b32819c7a7c5ddb095e88fe1384b4 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 25 Sep 2020 17:14:58 +0100 Subject: [PATCH 08/14] wip --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 12bad2c4..5d5dc2a4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,7 +41,7 @@ cache: #- 'c:\projects\download -> appveyor.yml' # Operating system (build VM template) -os: 'Visual Studio 2017' +os: 'Visual Studio 2019' # clone directory clone_folder: 'c:\projects\libtiff' From 4d1e1bc362445b7ba5fb1ee1ec652a39bfca6a70 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 9 Oct 2020 15:49:47 +0100 Subject: [PATCH 09/14] wip --- .appveyor.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5d5dc2a4..0c85fced 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,18 +24,15 @@ environment: shared: OFF - compiler: vc14-cmake configuration: Release - generator: Visual Studio 14 2015 Win64 + generator: Visual Studio 16 2019 shared: ON - compiler: vc14-cmake configuration: Debug - generator: Visual Studio 14 2015 Win64 + generator: Visual Studio 16 2019 shared: OFF - compiler: vc14-nmake configuration: Release - - compiler: vc9-cmake - configuration: Debug - generator: Visual Studio 9 2008 - shared: ON + cache: #- 'c:\projects\download -> appveyor.yml' @@ -78,8 +75,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%==mingw64-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%" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%' - - 'if %compiler%==vc9-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%' build_script: - if NOT %compiler%==vc14-nmake cd %AV_TIFF_BUILD% From 9911889a25dda9f6a68fe03e4fac3246e731c584 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 9 Oct 2020 16:19:58 +0100 Subject: [PATCH 10/14] wip --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 0c85fced..e594a151 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -65,6 +65,8 @@ before_build: - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - 'if %compiler%==mingw64-cmake set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS% -DCMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin\mingw32-make"' + - 'if %compiler%==mingw64-cmake set CC=gcc' + - 'if %compiler%==mingw64-cmake set CXX=g++' - set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_SOURCE%" - set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_INSTALL%" - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_CYG_SOURCE%' From 7d8b5e3695994ece9e5bd0f819d4b18accd81ded Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 9 Oct 2020 16:47:38 +0100 Subject: [PATCH 11/14] wip --- .appveyor.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e594a151..fb896f32 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,11 +16,11 @@ environment: shared: OFF - compiler: mingw64-cmake configuration: Release - generator: Unix Makefiles + generator: MinGW Makefiles shared: ON - compiler: mingw64-cmake configuration: Debug - generator: Unix Makefiles + generator: MinGW Makefiles shared: OFF - compiler: vc14-cmake configuration: Release @@ -64,9 +64,7 @@ before_build: - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - - 'if %compiler%==mingw64-cmake set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS% -DCMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin\mingw32-make"' - - 'if %compiler%==mingw64-cmake set CC=gcc' - - 'if %compiler%==mingw64-cmake set CXX=g++' + - 'if %compiler%==mingw64-cmake set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS%"' - set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_SOURCE%" - set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_INSTALL%" - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_CYG_SOURCE%' From aeddabed8434694c56ace1b8b53a52115b0cc274 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 9 Oct 2020 17:00:46 +0100 Subject: [PATCH 12/14] wip --- .appveyor.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index fb896f32..b3f47b71 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,11 +14,11 @@ environment: configuration: Debug generator: Unix Makefiles shared: OFF - - compiler: mingw64-cmake + - compiler: mingw-cmake configuration: Release generator: MinGW Makefiles shared: ON - - compiler: mingw64-cmake + - compiler: mingw-cmake configuration: Debug generator: MinGW Makefiles shared: OFF @@ -61,10 +61,8 @@ before_build: - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake --version || echo CMake not found' - 'if %compiler%==cygwin-cmake cygpath --version || echo cygpath not found' - 'if %compiler%==cygwin-cmake cmake --version || echo CMake not found' - - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" - - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"' - - 'if %compiler%==mingw64-cmake set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS%"' + - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%" - set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_SOURCE%" - set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_INSTALL%" - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_CYG_SOURCE%' @@ -74,14 +72,14 @@ before_build: - cd %AV_TIFF_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%==mingw64-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%==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%' build_script: - if NOT %compiler%==vc14-nmake cd %AV_TIFF_BUILD% - if %compiler%==vc14-nmake cd %AV_TIFF_SOURCE% - 'if %compiler%==cygwin-cmake bash -c "cmake --build . --config %configuration% --target install"' - - 'if %compiler%==mingw64-cmake cmake --build . --config %configuration% --target install' + - 'if %compiler%==mingw-cmake cmake --build . --config %configuration% --target install' - 'if %compiler%==vc14-cmake cmake --build . --config %configuration% --target install' - 'if %compiler%==vc9-cmake cmake --build . --config %configuration% --target install' - 'if %compiler%==vc14-nmake nmake /f Makefile.vc EXTRAFLAGS=/DHAVE_SNPRINTF=1' @@ -107,7 +105,7 @@ after_build: before_test: - cd %AV_TIFF_BUILD% - 'if %compiler%==cygwin-cmake bash -c "ctest -V -C %configuration%"' - - 'if %compiler%==mingw64-cmake ctest -V -C %configuration%' + - 'if %compiler%==mingw-cmake ctest -V -C %configuration%' - 'if %compiler%==vc14-cmake ctest -V -C %configuration%' - 'if %compiler%==vc9-cmake ctest -V -C %configuration%' # vc14-nmake does not support unit tests From 42b6225641341a155e50d1c6f1a466d896001dd6 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 9 Oct 2020 17:58:44 +0100 Subject: [PATCH 13/14] wip --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index b3f47b71..d60117f4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -67,6 +67,7 @@ before_build: - set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_INSTALL%" - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_CYG_SOURCE%' - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_CYG_INSTALL%' + - 'if %compiler%==mingw-cmake "PATH=C:\MinGW\bin;%PATH%"' - 'if %compiler%==vc14-nmake call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %platform%' - mkdir %AV_TIFF_BUILD% - cd %AV_TIFF_BUILD% From 7f8f6991da1b574612246ab748f743fd0b6b9b3b Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 9 Oct 2020 18:10:56 +0100 Subject: [PATCH 14/14] wip --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index d60117f4..04369ec6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -67,7 +67,7 @@ before_build: - set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_INSTALL%" - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_CYG_SOURCE%' - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_CYG_INSTALL%' - - 'if %compiler%==mingw-cmake "PATH=C:\MinGW\bin;%PATH%"' + - 'if %compiler%==mingw-cmake set "PATH=C:\MinGW\bin;%PATH%"' - 'if %compiler%==vc14-nmake call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %platform%' - mkdir %AV_TIFF_BUILD% - cd %AV_TIFF_BUILD%