diff options
| author | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
|---|---|---|
| committer | Barath Kannan <barathsotd@gmail.com> | 2017-12-27 16:57:43 +1100 |
| commit | d8f0ea999983892b8e5e49340ece3474ee257156 (patch) | |
| tree | ce9b615075350d90d0b7312874bae6dd202fe93b /ports/libkml | |
| parent | 22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff) | |
| parent | 6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff) | |
| download | vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip | |
resolve merge conflicts
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} |