diff options
| author | Guy Harris <gharris@sonic.net> | 2020-06-05 05:56:44 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-06-05 05:56:44 -0700 |
| commit | 54edaee1a079a4edd53baf74c1c00749d38d0f73 (patch) | |
| tree | d8d72097e404bbf26b9c50f9cbb7f36e928988ed | |
| parent | cba278cf1b25bf6760c1ce422abc17c20d8f4060 (diff) | |
| download | libpcap-54edaee1a079a4edd53baf74c1c00749d38d0f73.tar.gz | |
appveyor: give VS 2019 a different cmake command.
Maybe the quoting was confusing it or someething, so get rid of the
ARCHFLAG environment variable and, for VS 2019, run it with -A as one
argument and %PLATFORM% as another.
| -rw-r--r-- | .appveyor.yml | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 038b39d5..d861d18c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,77 +20,71 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "MinGW Makefiles" - ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES MINGW_ROOT: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "MinGW Makefiles" - ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES MINGW_ROOT: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015" - ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015 Win64" - ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015" - ARCHFLAG: "" SDK: npcap-sdk-1.05 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015 Win64" - ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017" - ARCHFLAG: "" SDK: WpdPack - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017 Win64" - ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017" - ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017 Win64" - ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017 Win64" - ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=NO - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 GENERATOR: "Visual Studio 16 2019" - ARCHFLAG: "-A x64" + PLATFORM: Win32 SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 GENERATOR: "Visual Studio 16 2019" - ARCHFLAG: "-A x86" + PLATFORM: x64 + SDK: WpdPack + AIRPCAP: -DDISABLE_AIRPCAP=YES + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + GENERATOR: "Visual Studio 16 2019" + PLATFORM: Win32 SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - GENERATOR: "Visual Studio 16 2019 Win64" - ARCHFLAG: "-A x64" + GENERATOR: "Visual Studio 16 2019" + PLATFORM: x64 SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - GENERATOR: "Visual Studio 16 2019 Win64" - ARCHFLAG: "-A x64" + GENERATOR: "Visual Studio 16 2019" + PLATFORM: x64 SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=NO @@ -113,6 +107,7 @@ build_script: - cmake --version - dir "C:\Program Files (x86)" - dir "C:\Program Files" - - cmake %AIRPCAP% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DAirPcap_ROOT=c:\projects\libpcap\Win32\Airpcap_Devpack -G"%GENERATOR%" "%ARCHFLAG%" .. + - if NOT "%GENERATOR%"=="Visual Studio 16 2019" cmake %AIRPCAP% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DAirPcap_ROOT=c:\projects\libpcap\Win32\Airpcap_Devpack -G"%GENERATOR%" .. + - if "%GENERATOR%"=="Visual Studio 16 2019" cmake %AIRPCAP% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DAirPcap_ROOT=c:\projects\libpcap\Win32\Airpcap_Devpack -G"%GENERATOR%"-A %PLATFORM% .. - if NOT "%GENERATOR%"=="MinGW Makefiles" msbuild /m /nologo /p:Configuration=Release pcap.sln - if "%GENERATOR%"=="MinGW Makefiles" mingw32-make |