From 66f583ec8e9b88cf52fe800c88fe8070fba7925b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 11 Feb 2021 22:03:26 +0100 Subject: [PATCH] CMAKE_GENERATOR workaround for vs2019 from conda-forge --- recipe/build-lib.bat | 3 +++ recipe/build-pkg.bat | 3 +++ 2 files changed, 6 insertions(+) diff --git a/recipe/build-lib.bat b/recipe/build-lib.bat index 2734d405..a0579033 100644 --- a/recipe/build-lib.bat +++ b/recipe/build-lib.bat @@ -45,6 +45,9 @@ if "%cuda_compiler_version%"=="None" ( echo Set up extra cmake-args: CUDA_CONFIG_ARGS=!CUDA_CONFIG_ARGS! ) +:: workaround for https://github.com/conda-forge/vc-feedstock/issues/21 +set "CMAKE_GENERATOR=Visual Studio 16 2019" + :: Build vanilla faiss.dll (no avx2) cmake -B _build_generic ^ -DBUILD_SHARED_LIBS=ON ^ diff --git a/recipe/build-pkg.bat b/recipe/build-pkg.bat index 7e2553df..91830e09 100644 --- a/recipe/build-pkg.bat +++ b/recipe/build-pkg.bat @@ -16,6 +16,9 @@ if "%cuda_compiler_version%"=="None" ( set "CUDAToolkit_ROOT=%CUDA_PATH%" ) +:: workaround for https://github.com/conda-forge/vc-feedstock/issues/21 +set "CMAKE_GENERATOR=Visual Studio 16 2019" + :: Build vanilla version (no avx2), see build-lib.bat cmake -B _build_python_generic ^ -Dfaiss_ROOT=%PREFIX% ^