diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-11-13 15:48:26 -0500 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-11-13 15:48:26 -0500 |
| commit | d9e39bb4056795a70028b228a746da4889ca7c15 (patch) | |
| tree | 4853304e1e71e45becedfba5d83e3f5321e0b9c9 /ports/libgit2 | |
| parent | 1a9dadf855ab93ff0803fd1ce4ecceec5bf211f0 (diff) | |
| parent | ffa114aaa43e8bcdf880d6e2c47ee0ed46125070 (diff) | |
| download | vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.tar.gz vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/libgit2')
| -rw-r--r-- | ports/libgit2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgit2/portfile.cmake | 6 |
2 files changed, 6 insertions, 2 deletions
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()
|