ci: WIP msbuild

ndsev · Nov 17, 2023 · 77845e4 · 77845e4
1 parent d07ad04
commit 77845e4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml
@@ -72,16 +72,14 @@ jobs:
       - name: Install Conan
         run: |
           pip install conan
-          conan profile detect
       - run: python -m pip install setuptools wheel
+      - run: python -m pip install ninja
       - run: mkdir build
       - name: Build (macOS)
         if: matrix.os == 'macos-latest' || matrix.os == 'macos-10.15'
         working-directory: build
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           python -m pip install delocate
-          brew install ninja
           export MACOSX_DEPLOYMENT_TARGET=10.15
           cmake -DPython3_ROOT_DIR=$pythonLocation \
                 -DPython3_FIND_FRAMEWORK=LAST \
@@ -95,14 +93,17 @@ jobs:
           ./_deps/python-cmake-wheel-src/repair-wheel-macos.bash \
                 "$(pwd)"/bin/wheel-auditme/mapget*.whl \
                 "$(pwd)"/bin/wheel mapget
+      - name: Add msbuild to PATH (Windows)
+        if: matrix.os == 'windows-latest' || matrix.os == 'windows-2019'
+        uses: microsoft/setup-msbuild@v1.0.1  conan profile detect
       - name: Build (Windows)
         if: matrix.os == 'windows-latest' || matrix.os == 'windows-2019'
         working-directory: build
         env:
           CMAKE_GENERATOR: "Visual Studio 16 2019"
         run: |
           echo "cmake -DPython3_ROOT_DIR=$env:pythonLocation"
-          cmake "-DPython3_ROOT_DIR=$env:pythonLocation" -DPython3_FIND_REGISTRY=LAST -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_BUILD_TYPE=Release ..
+          cmake "-DPython3_ROOT_DIR=$env:pythonLocation" -DPython3_FIND_REGISTRY=LAST -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_DEST_WIN }}\scripts\buildsystems\vcpkg.cmake -GNinja ..
           cmake --build . --config Release
       - name: Deploy
         uses: actions/upload-artifact@v2