mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 02:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix .gitignore excluding triplets/community, sort, and driveby vcpkg_check_linkage.md doc bug. (#12624)

Browse Source 
* 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>
This commit is contained in:
Billy O'Neal 2020-08-01 13:57:39 -07:00 committed by GitHub
parent 5512eafd80
commit 322b17f573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.gitignore vendored
View File

@ -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

4
docs/maintainers/vcpkg_check_linkage.md
View File

@ -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)