From 4076aab840d4e4dae31b2fa8de4ba85816600b6f Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Tue, 3 Sep 2024 15:25:43 -0500 Subject: [PATCH] CI: Update Windows build to LibPack 3 --- .github/workflows/actions/windows/getLibpack/action.yml | 4 ++-- .github/workflows/sub_buildWindows.yml | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/actions/windows/getLibpack/action.yml b/.github/workflows/actions/windows/getLibpack/action.yml index 55135e38d7..9db6e6d8ba 100644 --- a/.github/workflows/actions/windows/getLibpack/action.yml +++ b/.github/workflows/actions/windows/getLibpack/action.yml @@ -41,11 +41,11 @@ inputs: libpackdownloadurl: description: "URL where to download libpack" required: false - default: https://github.com/FreeCAD/FreeCAD-LibPack/releases/download/2.10/LibPack-0.21-V2.10.7z + default: https://github.com/FreeCAD/FreeCAD-LibPack/releases/download/3.0.0RC4/LibPack-1.0.0-v3.0.0RC4-Release.7z libpackname: description: "Libpack name (once downloaded)" required: false - default: LibPack-0.21-V2.10 + default: LibPack-1.0.0-v3.0.0RC4-Release runs: using: "composite" diff --git a/.github/workflows/sub_buildWindows.yml b/.github/workflows/sub_buildWindows.yml index 329e79896a..2ccbd44fba 100644 --- a/.github/workflows/sub_buildWindows.yml +++ b/.github/workflows/sub_buildWindows.yml @@ -107,13 +107,6 @@ jobs: -DFREECAD_USE_PCH=OFF -DFREECAD_RELEASE_PDB=OFF -DFREECAD_LIBPACK_DIR="${{ env.libpackdir }}" - -DPYTHON_DEBUG_LIBRARY="${{ env.libpackdir }}bin/libs/python38_d.lib" - -DPYTHON_EXECUTABLE="${{ env.libpackdir }}bin/python.exe" - -DPYTHON_INCLUDE_DIR="${{ env.libpackdir }}bin/include" - -DPYTHON_LIBRARY="${{ env.libpackdir }}bin/libs/python38.lib" - -DXercesC_INCLUDE_DIR="${{ env.libpackdir }}include" - -DXercesC_LIBRARY_RELEASE="${{ env.libpackdir }}lib/xerces-c_3.lib" - -DXercesC_LIBRARY_DEBUG="${{ env.libpackdir }}lib/xerces-c_3D.lib" -DFREECAD_COPY_DEPEND_DIRS_TO_BUILD=ON -DFREECAD_COPY_LIBPACK_BIN_TO_BUILD=ON -DFREECAD_COPY_PLUGINS_BIN_TO_BUILD=ON