diff options
| author | xoviat <xoviat@users.noreply.github.com> | 2017-12-20 13:24:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 13:24:59 -0600 |
| commit | f1f373b189453f33a944e9db8b3451b1c785e223 (patch) | |
| tree | 8713b7dc28734e4d4ad0ebba76459850955ce004 /ports/libkml | |
| parent | 6363688b6d2f3522a4ce48cedb60da31775cd923 (diff) | |
| parent | 6cb6a61aaf5ef2c143f974e9f731778bcd3f5cbe (diff) | |
| download | vcpkg-f1f373b189453f33a944e9db8b3451b1c785e223.tar.gz vcpkg-f1f373b189453f33a944e9db8b3451b1c785e223.zip | |
Merge branch 'master' into fftw
Diffstat (limited to 'ports/libkml')
| -rw-r--r-- | ports/libkml/CONTROL | 4 | ||||
| -rw-r--r-- | ports/libkml/portfile.cmake | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/libkml/CONTROL b/ports/libkml/CONTROL index bc054e036..b5ea568c7 100644 --- a/ports/libkml/CONTROL +++ b/ports/libkml/CONTROL @@ -1,4 +1,4 @@ Source: libkml -Version: 1.3.0-1 +Version: 1.3.0-2 Description: Reference implementation of OGC KML 2.2 -Build-Depends: zlib, boost, expat, minizip, uriparser +Build-Depends: zlib, expat, minizip, uriparser, boost-smart-ptr diff --git a/ports/libkml/portfile.cmake b/ports/libkml/portfile.cmake index cb07e271f..b2e846d3c 100644 --- a/ports/libkml/portfile.cmake +++ b/ports/libkml/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/patch_empty_literal_on_vc.patch" ) +file(REMOVE ${SOURCE_PATH}/cmake/External_boost.cmake) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} |