]> The Tcpdump Group git mirrors - tcpdump/commitdiff
appveyor: add VS 2019 tests.
authorGuy Harris <[email protected]>
Fri, 5 Jun 2020 23:34:57 +0000 (16:34 -0700)
committerGuy Harris <[email protected]>
Fri, 5 Jun 2020 23:34:57 +0000 (16:34 -0700)
VS 2019 is different from earlier versions of VS in the way it handles
the target platform; handle that in the fashion that much bashing on
libpcap's .appveyor.yml got to work.

.appveyor.yml

index ea026f672e3a75fff806ce888c28f8315ecca67b..12797beac07d8c39c665b640c44478b619efff72 100644 (file)
@@ -37,6 +37,22 @@ environment:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: "Visual Studio 15 2017 Win64"
       SDK: npcap-sdk-1.05
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       GENERATOR: "Visual Studio 15 2017 Win64"
       SDK: npcap-sdk-1.05
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      GENERATOR: "Visual Studio 16 2019"
+      PLATFORM: Win32
+      SDK: WpdPack
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      GENERATOR: "Visual Studio 16 2019"
+      PLATFORM: x64
+      SDK: WpdPack
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      GENERATOR: "Visual Studio 16 2019"
+      PLATFORM: Win32
+      SDK: npcap-sdk-1.05
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      GENERATOR: "Visual Studio 16 2019"
+      PLATFORM: x64
+      SDK: npcap-sdk-1.05
 
 build_script:
   #
 
 build_script:
   #
@@ -45,5 +61,6 @@ build_script:
   - type NUL >.devel
   - md build
   - cd build
   - type NUL >.devel
   - md build
   - cd build
-  - cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" ..
+  - if NOT DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" ..
+  - if DEFINED PLATFORM cmake -DPCAP_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -A %PLATFORM% ..
   - msbuild /m /nologo /p:Configuration=Release tcpdump.sln
   - msbuild /m /nologo /p:Configuration=Release tcpdump.sln