diff options
author | 2017-08-23 15:26:18 +0200 | |
---|---|---|
committer | 2017-08-23 15:26:18 +0200 | |
commit | ec3338dc9d73196bb04c3622ddd6ebcc1c1fecbf (patch) | |
tree | ba96899fe0f7dc07b466a359a89f43efa19c5b68 /tools/run_tests/helper_scripts/pre_build_cmake.bat | |
parent | 91eeb79e526393cd1123154c6398ffb5e3f6faf0 (diff) |
add cmake generator option
Diffstat (limited to 'tools/run_tests/helper_scripts/pre_build_cmake.bat')
-rw-r--r-- | tools/run_tests/helper_scripts/pre_build_cmake.bat | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/run_tests/helper_scripts/pre_build_cmake.bat b/tools/run_tests/helper_scripts/pre_build_cmake.bat index a770aa8118..78f04781de 100644 --- a/tools/run_tests/helper_scripts/pre_build_cmake.bat +++ b/tools/run_tests/helper_scripts/pre_build_cmake.bat @@ -14,7 +14,8 @@ setlocal -set ARCHITECTURE=%1 +set GENERATOR=%1 +set ARCHITECTURE=%2 cd /d %~dp0\..\..\.. @@ -27,7 +28,7 @@ cd build @rem If yasm is not on the path, use hardcoded path instead. yasm --version || set USE_HARDCODED_YASM_PATH_MAYBE=-DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" -cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../.. || goto :error +cmake -G "%GENERATOR%" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../.. || goto :error endlocal |