Merge remote-tracking branch 'refs/remotes/origin/scikit_build' into scikit_build

Author: ChrisBarker-NOAA

.github/workflows/cibuildwheel.yaml

@@ -55,19 +55,22 @@ jobs:
           echo "VCPKG_INSTALLATION_ROOT=$VCPKG_INSTALLATION_ROOT"
           echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
           echo "CMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" >> $GITHUB_ENV
+<<<<<<< HEAD
           echo $CMAKE_BINARY_DIR
           # echo "where vcpkg" >> VCPKG_ROOT
           echo $VCPKG_ROOT
       - name: Setup deps (Windows)
         if: runner.os == 'Windows'
         run: |
           # why not put the vcpkg.json in the repo?
+=======
+      - name: Setup deps (Windows)
+        if: runner.os == 'Windows'
+        run: |
+        # why not have the vcpkg.json committed to the repo?
+>>>>>>> refs/remotes/origin/scikit_build
           vcpkg new --application
           vcpkg add port pkgconf vcpkg-cmake vcpkg-cmake-config libgd
-          dir /a py_gd
-          dir C:/vcpkg/
-          echo "CMAKE BIN DIR is : $CMAKE_BINARY_DIR"
-          dir $CMAKE_BINARY_DIR
       - uses: astral-sh/setup-uv@v6
 
       - uses: pypa/cibuildwheel@v3.0