try to use vcpkg

gem · Nov 20, 2023 · 4e558ca · 4e558ca
1 parent 6edf87d
commit 4e558ca
Showing 1 changed file with 25 additions and 29 deletions.
diff --git a/.github/workflows/test_windows.yaml b/.github/workflows/test_windows.yaml
@@ -30,37 +30,33 @@ jobs:
           platform: "x64-windows"
         shell: cmd
         run: |
-          set VCPKG_INSTALLED=C:\vcpkg\installed\%platform%-windows
-          set BASE_INST_DIR="C:\tools\installed"
-          set PROJ_DIR=%BASE_INST_DIR%\proj-%PROJSOURCE:~0,5%
-          set
-          cd %RUNNER_WORKSPACE%
-          dir
-          git clone https://github.com/Microsoft/vcpkg.git
+          REM set CPKG_INSTALLED
+          REM set BASE_INST_DIR="C:\tools\installed"
+          REM set PROJ_DIR=%BASE_INST_DIR%\proj-%PROJSOURCE:~0,5%
+          #git clone https://github.com/Microsoft/vcpkg.git
           REM
-          .\vcpkg\bootstrap-vcpkg.bat -disableMetrics 
-          .\vcpkg install sqlite3[core,tool]:"%platform%"-windows 
-          .\vcpkg install tiff:"%platform%"-windows 
-          .\vcpkg install curl:"%platform%"-windows
+          vcpkg install sqlite3[core,tool]:"%platform%"
+          vcpkg install tiff:"%platform%"
+          vcpkg install curl:"%platform%"
           cd %RUNNER_WORKSPACE%
-          mkdir c:\tools
-          set PATH=%VCPKG_INSTALLED%\bin;%PATH%
-          dir %VCPKG_INSTALLED%\bin
-          cd c:\tools
-          curl -o "proj-%PROJSOURCE:~0,5%.zip" "https://download.osgeo.org/proj/proj-%PROJSOURCE%.zip"
-          7z x -aoa -y "proj-%PROJSOURCE:~0,5%.zip"
-          dir
-          #
-          cd "c:\tools\proj-%PROJSOURCE:~0,5%"
-          # set BUILD_PROJ=1
-          mkdir build
-          cd build
-          cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS="%BUILD_SHARED_LIBS%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%"
-          ninja -v
-          ninja install
-          set PATH=%PROJ_DIR%\bin;%PATH%
-          set PROJ_DATA=%PROJ_DIR%\share\proj
-          proj
+          dir C:\vcpkg
+          #set PATH=%VCPKG_INSTALLED%\bin;%PATH%
+          #dir %VCPKG_INSTALLED%\bin
+          #cd c:\tools
+          #curl -o "proj-%PROJSOURCE:~0,5%.zip" "https://download.osgeo.org/proj/proj-%PROJSOURCE%.zip"
+          #7z x -aoa -y "proj-%PROJSOURCE:~0,5%.zip"
+          #dir
+          ##
+          #cd "c:\tools\proj-%PROJSOURCE:~0,5%"
+          ## set BUILD_PROJ=1
+          #mkdir build
+          #cd build
+          #cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS="%BUILD_SHARED_LIBS%" -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX="%PROJ_DIR%"
+          #ninja -v
+          #ninja install
+          #set PATH=%PROJ_DIR%\bin;%PATH%
+          #set PROJ_DATA=%PROJ_DIR%\share\proj
+          #proj
           #python -m pip wheel . --wheel-dir=${GITHUB_WORKSPACE}/wheels_torepair --no-deps
       - name: Upload artifacts
         uses: actions/upload-artifact@v3