diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-07 06:46:08 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-07 06:46:08 -0700 |
| commit | 5f399d173bd73b4d48442e2241859c4a5fb854f1 (patch) | |
| tree | 272adf760f8bf0e37347e131075a51b610746785 /tools/run_tests/helper_scripts/pre_build_csharp.bat | |
| parent | 7b6c7a3927f75704cb3f7f02024f284b6817405a (diff) | |
| parent | b567bb43670f7f2523164fdabdea8786a7595854 (diff) | |
Merge github.com:grpc/grpc into minimal_test
Diffstat (limited to 'tools/run_tests/helper_scripts/pre_build_csharp.bat')
| -rw-r--r-- | tools/run_tests/helper_scripts/pre_build_csharp.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/run_tests/helper_scripts/pre_build_csharp.bat b/tools/run_tests/helper_scripts/pre_build_csharp.bat index 99df1c6626..bee430ac86 100644 --- a/tools/run_tests/helper_scripts/pre_build_csharp.bat +++ b/tools/run_tests/helper_scripts/pre_build_csharp.bat @@ -43,7 +43,7 @@ cd build mkdir %ARCHITECTURE% cd %ARCHITECTURE% @rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../../.. || goto :error +cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../../.. || goto :error cd ..\..\.. @rem Location of nuget.exe |