From 8bb061a20cc1389b76d3c9771254f48b0c4cdf28 Mon Sep 17 00:00:00 2001 From: kjpus <35301243+kjpus@users.noreply.github.com> Date: Tue, 9 Oct 2018 03:27:45 -0400 Subject: Build static libgit2 with dynamic CRT on Windows (#4432) * Build static libgit2 with dynamic CRT on Windows * [vcpkg-triplets] Revert changes to built-in triplets * [libgit2] Simplify computation of STATIC_CRT --- ports/libgit2/CONTROL | 2 +- ports/libgit2/portfile.cmake | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'ports/libgit2') diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL index 9a2b518a4..f44900b72 100644 --- a/ports/libgit2/CONTROL +++ b/ports/libgit2/CONTROL @@ -1,4 +1,4 @@ Source: libgit2 -Version: 0.27.4-1 +Version: 0.27.4-2 Build-Depends: openssl (!windows&&!uwp) Description: Git linkable library diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index be3139a81..0982e5be1 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -10,13 +10,17 @@ vcpkg_from_github( REPO libgit2/libgit2 REF v0.27.4 SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61 - HEAD_REF master) + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DBUILD_CLAR=OFF + -DSTATIC_CRT=${STATIC_CRT} ) vcpkg_install_cmake() -- cgit v1.2.3