Skip to content

Commit

Permalink
Auto merge of #870 - micbou:no-7zip-prompt, r=bstaletic
Browse files Browse the repository at this point in the history
[READY] Run 7-Zip in non-interactive mode

When doing an incremental build on Windows, CMake will be stuck extracting libclang from the installer because 7-Zip asks the user if he want to overwrite existing files. We can avoid that by adding the `-y` option to the 7-Zip command.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/ycmd/870)
<!-- Reviewable:end -->
  • Loading branch information
zzbot authored Nov 5, 2017
2 parents 0c2a614 + 15d238e commit 0ca16e7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cpp/ycm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ if ( USE_CLANG_COMPLETER AND
"7-zip is needed to extract the files from the Clang installer. "
"Install it and try again." )
endif()
execute_process( COMMAND ${7Z_EXECUTABLE} x ${CLANG_FILENAME} OUTPUT_QUIET )
execute_process( COMMAND
${7Z_EXECUTABLE} -y x ${CLANG_FILENAME} OUTPUT_QUIET )
else()
execute_process( COMMAND tar -xzf ${CLANG_FILENAME} )
endif()
Expand Down

0 comments on commit 0ca16e7

Please sign in to comment.