diff options
| author | Alexander Saprykin <xelfium@gmail.com> | 2018-05-26 13:27:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 13:27:14 +0200 |
| commit | 4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5 (patch) | |
| tree | d95c9490352eb73f078d34a33bc4bb44ac9fa48b /.gitignore | |
| parent | fb689bd13dd6ba563a885d71fff1dd2b32a615db (diff) | |
| parent | 2ac7527b40b1dbeb7856b9f763362c1e139e2ca9 (diff) | |
| download | vcpkg-4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5.tar.gz vcpkg-4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5.zip | |
Merge pull request #1 from Microsoft/master
Update vcpkg from upstream
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 003d607fd..796739b31 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +vcpkg # Visual Studio 2015 cache/options directory .vs/ @@ -273,14 +274,31 @@ __pycache__/ ############################################################ .vscode/ +*.code-workspace buildtrees/ +build*/ downloads/ -installed/ +installed*/ packages/ scripts/buildsystems/tmp/ +#ignore custom triplets +triplets/* +#add vcpkg-designed triplets back in +!triplets/arm-uwp.cmake +!triplets/arm-windows.cmake +!triplets/x64-uwp.cmake +!triplets/x64-windows.cmake +!triplets/x64-windows-static.cmake +!triplets/x86-uwp.cmake +!triplets/x86-windows.cmake +!triplets/x86-windows-static.cmake +!triplets/arm64-uwp.cmake +!triplets/arm64-windows.cmake +!triplets/x64-linux.cmake +!triplets/x64-osx.cmake *.exe *.zip ############################################################ # vcpkg - End -############################################################
\ No newline at end of file +############################################################ |