diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-08-01 13:57:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 13:57:39 -0700 |
| commit | 322b17f573e84ea7c4db9b74fb320d24664a892e (patch) | |
| tree | de7544de9500f760b735b0f121726e01ec5a9baa | |
| parent | 5512eafd80a1f69384d1f06a19f7ca04fa7dad9b (diff) | |
| download | vcpkg-322b17f573e84ea7c4db9b74fb320d24664a892e.tar.gz vcpkg-322b17f573e84ea7c4db9b74fb320d24664a892e.zip | |
[vcpkg] Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (#12624)
* Un-.gitignore /triplets/community and use an absolute glob for all non .gitignore'd triplets.
* Fix vcpkg_check_linkage.md example to a port that actually uses vcpkg_check_linkage.
* Exclude all of the community directory.
* Update .gitignore
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
| -rw-r--r-- | .gitignore | 48 | ||||
| -rw-r--r-- | docs/maintainers/vcpkg_check_linkage.md | 4 |
2 files changed, 15 insertions, 37 deletions
diff --git a/.gitignore b/.gitignore index d3be89f60..d9b919fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -293,43 +293,21 @@ __pycache__/ /toolsrc/msbuild.x86.release/ /toolsrc/msbuild.x64.debug/ /toolsrc/msbuild.x64.release/ +#ignore custom triplets /triplets/* #add vcpkg-designed triplets back in -!triplets/community/arm64-mingw-dynamic.cmake -!triplets/community/arm64-mingw-static.cmake -!triplets/community/arm64-uwp.cmake -!triplets/community/arm64-windows-static.cmake -!triplets/community/arm-mingw-dynamic.cmake -!triplets/community/arm-mingw-static.cmake -!triplets/community/arm-windows.cmake -!triplets/community/x64-mingw-dynamic.cmake -!triplets/community/x64-mingw-static.cmake -!triplets/community/x64-windows-static-md.cmake -!triplets/community/x86-mingw-dynamic.cmake -!triplets/community/x86-mingw-static.cmake -!triplets/community/x86-uwp.cmake -!triplets/community/x86-windows-static.cmake -!triplets/community/x86-windows-static-md.cmake -!triplets/community/x64-osx-dynamic.cmake -!triplets/community/x64-android.cmake -!triplets/community/x86-android.cmake -!triplets/community/arm-android.cmake -!triplets/community/arm64-android.cmake -!triplets/community/arm64-ios.cmake -!triplets/community/arm-ios.cmake -!triplets/community/x64-ios.cmake -!triplets/community/x86-ios.cmake -!triplets/community/wasm32-emscripten.cmake -!triplets/community/arm64-osx.cmake -!triplets/arm-uwp.cmake -!triplets/x64-uwp.cmake -!triplets/x64-windows.cmake -!triplets/x64-windows-static.cmake -!triplets/x86-windows.cmake -!triplets/arm64-windows.cmake -!triplets/x64-linux.cmake -!triplets/x64-osx.cmake -#ignore custom triplets +!/triplets/arm-uwp.cmake +!/triplets/arm64-windows.cmake +!/triplets/x64-linux.cmake +!/triplets/x64-osx.cmake +!/triplets/x64-uwp.cmake +!/triplets/x64-windows-static.cmake +!/triplets/x64-windows.cmake +!/triplets/x86-windows.cmake + +!/triplets/community +!/triplets/community/** + *.exe *.zip diff --git a/docs/maintainers/vcpkg_check_linkage.md b/docs/maintainers/vcpkg_check_linkage.md index 406325dba..eb20e97c8 100644 --- a/docs/maintainers/vcpkg_check_linkage.md +++ b/docs/maintainers/vcpkg_check_linkage.md @@ -28,7 +28,7 @@ This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, ## Examples -* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) +* [abseil](https://github.com/Microsoft/vcpkg/blob/master/ports/abseil/portfile.cmake) ## Source -[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)
+[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake) |