diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2017-05-02 16:28:23 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2017-05-02 16:28:38 +0200 |
| commit | 56d8f825e1ddeb204d952c6c4a3e70098ca4d629 (patch) | |
| tree | f4e851dbe66e9f930a04dcbd7b11a5cc13a9dd53 /tools/run_tests/helper_scripts/pre_build_cmake.bat | |
| parent | 1306724462518e5e41d648f3c78fcc9953d79c3f (diff) | |
fix Windows cmake build on internal_ci
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, 4 insertions, 1 deletions
diff --git a/tools/run_tests/helper_scripts/pre_build_cmake.bat b/tools/run_tests/helper_scripts/pre_build_cmake.bat index c937b9e09f..c721e1624d 100644 --- a/tools/run_tests/helper_scripts/pre_build_cmake.bat +++ b/tools/run_tests/helper_scripts/pre_build_cmake.bat @@ -37,7 +37,10 @@ mkdir build cd build @rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly -cmake -G "Visual Studio 14 2015" -DgRPC_BUILD_TESTS=ON -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../.. || goto :error +@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" -DgRPC_BUILD_TESTS=ON %USE_HARDCODED_YASM_PATH_MAYBE% ../.. || goto :error endlocal |