diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-21 21:00:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 21:00:24 -0700 |
| commit | 33af90d42af68ef343edb00a69b1e11548a9e2e1 (patch) | |
| tree | c338f44bd8a960e8eafc52b91f6a1f666a927512 /scripts/cmake | |
| parent | e16f9c29a05aa178ce8a476a293723ab92f08f89 (diff) | |
| download | vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.tar.gz vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.zip | |
[many ports] Updates 2019.05.19 (#6524)
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_build_cmake.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index e86632c7e..3db6597b4 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -162,14 +162,14 @@ function(vcpkg_build_cmake) endif() endwhile() endif() - elseif(out_contents MATCHES "mt : general error c101008d: ") + elseif(out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: ") # Antivirus workaround - occasionally files are locked and cause mt.exe to fail set(ITERATION 0) - while (ITERATION LESS 3 AND out_contents MATCHES "mt : general error c101008d: ") + while (ITERATION LESS 3 AND (out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: ")) MATH(EXPR ITERATION "${ITERATION}+1") message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${ITERATION}") execute_process( - COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} + COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG} OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log" ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log" RESULT_VARIABLE error_code |