vcpkg: update

Author: igagis

.github/workflows/ci.yml

@@ -421,8 +421,8 @@ jobs:
         filename: '.\nuget\*.nupkg'
         api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }}
       if: startsWith(github.ref, 'refs/tags/')
-##### vcpkg #####
-  vcpkg:
+##### vcpkg-linux #####
+  vcpkg-linux:
     strategy:
       fail-fast: false
       matrix:
@@ -467,14 +467,54 @@ jobs:
         if: always() # even if previous steps fail, this one needs to be run
         uses: actions/upload-artifact@v4
         with:
-          name: vcpkg_logs
+          name: vcpkg_linux_logs
           path: |
             vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
             build/vcpkg/**/*.log
       - name: deploy vcpkg port
         run: |
           myci-deploy-vcpkg.sh --repo cppfw/vcpkg-repo --port-dir build/vcpkg/overlay/${PACKAGE_NAME}
         if: startsWith(github.ref, 'refs/tags/')
+##### vcpkg-windows #####
+  vcpkg-windows:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: powershell
+    name: vcpkg - windows
+    steps:
+    - name: git clone
+      uses: actions/checkout@v4
+    - name: get myci scripts
+      uses: actions/checkout@v4
+      with:
+        repository: cppfw/myci
+        ref: latest
+        path: myci
+    - name: add myci to PATH
+      uses: myci-actions/export-env-var-powershell@main
+      with: {name: PATH, value: "$env:Path;myci/src/powershell"}
+    - name: set VCPKG_ROOT
+      uses: myci-actions/export-env-var-powershell@main
+      # accorging to github actions windows image docs, it should define VCPKG_INSTALLATION_ROOT env var,
+      # but on practice it is not set, so specify vcpkg root path explicitly
+      with: {name: VCPKG_ROOT, value: "C:/vcpkg/"}
+    - name: prepare vcpkg port
+      run: myci-vcpkg-prepare.ps1 -gitref ${{ github.sha }}
+    - name: test vcpkg port
+      run: |
+        cd build/vcpkg/test
+        cmake .
+        cmake --build . --parallel
+        ./Debug/test.exe
+    - name: upload vcpkg logs to artifacts
+      if: always() # even if previous steps fail, this one needs to be run
+      uses: actions/upload-artifact@v4
+      with:
+        name: vcpkg_windows_logs
+        path: |
+          vcpkg-installation/buildtrees/${{ env.PACKAGE_NAME }}/
+          build/vcpkg/**/*.log
 ##### conan - linux #####
   conan-linux:
     strategy:

build/cmake/CMakeLists.txt

@@ -7,8 +7,6 @@ project(${name})
 # Otherwise VCPKG does not set the CMAKE_PREFIX_PATH to find packages.
 find_package(myci CONFIG REQUIRED)
 
-find_package(ZLIB REQUIRED)
-
 set(srcs)
 myci_add_source_files(srcs
     DIRECTORY
@@ -29,6 +27,4 @@ myci_declare_library(${name}
         r4
         mikroxml
         cssom
-    EXTERNAL_DEPENDENCIES
-        ZLIB::ZLIB
 )

build/vcpkg/test/CMakeLists.txt

@@ -4,12 +4,6 @@ set(CMAKE_TOOLCHAIN_FILE $ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
 
 project(test)
 
-find_package(utki CONFIG REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(papki CONFIG REQUIRED)
-find_package(cssom CONFIG REQUIRED)
-find_package(mikroxml CONFIG REQUIRED)
-find_package(r4 CONFIG REQUIRED)
 find_package(svgdom CONFIG REQUIRED)
 
 add_executable(test main.cpp)

build/vcpkg/test/vcpkg-configuration.json

@@ -8,7 +8,7 @@
       {
         "kind": "git",
         "repository": "https://github.com/cppfw/vcpkg-repo/",
-        "baseline": "c7ff7bc78fe617434cc09c52b5eb111d568197c1",
+        "baseline": "f3e91e1cc2383dffb7047fa0dccc2ccd957713b9",
         "reference": "main",
         "packages": [ "myci", "utki", "papki", "mikroxml", "cssom", "r4" ]
       }

build/vcpkg/usage

@@ -1,11 +1,5 @@
 svgdom provides CMake targets:
 
-find_package(utki CONFIG REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(papki CONFIG REQUIRED)
-find_package(cssom CONFIG REQUIRED)
-find_package(mikroxml CONFIG REQUIRED)
-find_package(r4 CONFIG REQUIRED)
 find_package(svgdom CONFIG REQUIRED)
 
 target_link_libraries(main PRIVATE svgdom::svgdom)