Skip to content

Commit

Permalink
Add triplets for static libraries with dynamic CRT on Windows (micros…
Browse files Browse the repository at this point in the history
…oft#10028)

* Add triplets for static libs with dynamic CRT

* Update .gitignore
  • Loading branch information
vicroms authored Feb 12, 2020
1 parent 7365cd7 commit 71a9def
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -291,17 +291,18 @@ __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.cmake
!triplets/community/arm64-uwp.cmake
!triplets/community/arm-mingw.cmake
!triplets/community/arm-windows.cmake
!triplets/community/x64-mingw.cmake
!triplets/community/x64-windows-static-md.cmake
!triplets/community/x86-mingw.cmake
!triplets/community/x86-uwp.cmake
!triplets/community/x86-windows-static.cmake
!triplets/community/x86-windows-static-md.cmake
!triplets/arm-uwp.cmake
!triplets/x64-uwp.cmake
!triplets/x64-windows.cmake
Expand All @@ -310,6 +311,7 @@ __pycache__/
!triplets/arm64-windows.cmake
!triplets/x64-linux.cmake
!triplets/x64-osx.cmake
#ignore custom triplets
*.exe
*.zip

Expand Down
3 changes: 3 additions & 0 deletions triplets/community/x64-windows-static-md.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
3 changes: 3 additions & 0 deletions triplets/community/x86-windows-static-md.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(VCPKG_TARGET_ARCHITECTURE x86)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE static)

0 comments on commit 71a9def

Please sign in to comment.