official msbuild

TomographicImaging · Sep 26, 2024 · bc4b20c · bc4b20c
1 parent b97265f
commit bc4b20c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,13 +51,14 @@ jobs:
         fetch-depth: 0
         submodules: recursive
         ref: ${{ github.event.pull_request.head.sha || github.ref }} # fix SHA
+    - if: matrix.os == 'windows'
+      uses: microsoft/setup-msbuild@v2
+      with: {msbuild-architecture: x64}
     - uses: conda-incubator/setup-miniconda@v3
       with:
         python-version: ${{ matrix.python-version }}
         mamba-version: "1.5"
         channels: conda-forge
-    - if: matrix.os == 'windows'
-      uses: ilammy/msvc-dev-cmd@v1
     - name: conda build & test
       working-directory: recipe
       run: |

diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -5,7 +5,7 @@ if not "%GIT_DESCRIBE_NUMBER%"=="0" (
     set SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CIL=%PKG_VERSION%.dev%GIT_DESCRIBE_NUMBER%+%GIT_DESCRIBE_HASH%
 )
 
-cmake -S "%RECIPE_DIR%\.." -B "%SRC_DIR%\build_framework" -G "NMake Makefiles" -DCONDA_BUILD=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBRARY_LIB=%CONDA_PREFIX%\lib -DLIBRARY_INC=%CONDA_PREFIX% -DCMAKE_INSTALL_PREFIX=%PREFIX%
+cmake -S "%RECIPE_DIR%\.." -B "%SRC_DIR%\build_framework" -DCONDA_BUILD=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBRARY_LIB=%CONDA_PREFIX%\lib -DLIBRARY_INC=%CONDA_PREFIX% -DCMAKE_INSTALL_PREFIX=%PREFIX%
 if errorlevel 1 exit 1
 
 cmake --build "%SRC_DIR%\build_framework" --target install --config RelWithDebInfo