build/win: nmake generator & auto toolset

- reverts #1928
TomographicImaging · Sep 26, 2024 · b97265f · b97265f
1 parent 7f5a81e
commit b97265f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,6 +56,8 @@ jobs:
         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,10 +5,7 @@ if not "%GIT_DESCRIBE_NUMBER%"=="0" (
     set SETUPTOOLS_SCM_PRETEND_VERSION_FOR_CIL=%PKG_VERSION%.dev%GIT_DESCRIBE_NUMBER%+%GIT_DESCRIBE_HASH%
 )
 
-:: -G "Visual Studio 16 2019" specifies the the generator
-:: -T v142 specifies the toolset
-
-cmake -S "%RECIPE_DIR%\.." -B "%SRC_DIR%\build_framework" -G "Visual Studio 16 2019" -T "v142" -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" -G "NMake Makefiles" -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