Fixes build validation and adds vcpkg auto download to README

aMannus · Nov 4, 2022 · 404ce30 · 404ce30
1 parent 2aecab6
commit 404ce30
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml
@@ -86,5 +86,5 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: soh-windows
-        path: build-cmake/**/src/**/*.lib
+        path: build-cmake/src/**/*.lib
         if-no-files-found: error
diff --git a/.gitignore b/.gitignore
@@ -337,5 +337,6 @@ MigrationBackup/
 !libultraship/Lib/**
 libultraship/DebugObj/*
 build/
+build-cmake/
 libultraship.a
 .DS_Store
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # libultraship
 
-## Building
+## Building on Linux/Mac
 ```
 cmake -H. -Bbuild
 cmake --build build
@@ -9,7 +9,12 @@ cmake --build build
 ## Generating a Visual Studio `.sln` on Windows
 ```
 # Visual Studio 2022
-& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64
+& 'C:\Program Files\CMake\bin\cmake' -DUSE_AUTO_VCPKG=true -S . -B "build/x64" -G "Visual Studio 17 2022" -T v142 -A x64
 # Visual Studio 2019
-& 'C:\Program Files\CMake\bin\cmake' -S . -B "build/x64" -G "Visual Studio 16 2019" -T v142 -A x64
+& 'C:\Program Files\CMake\bin\cmake' -DUSE_AUTO_VCPKG=true -S . -B "build/x64" -G "Visual Studio 16 2019" -T v142 -A x64
+```
+
+## To build on Windows
+```
+& 'C:\Program Files\CMake\bin\cmake' --build .\build\x64
 ```