diff options
| author | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
| commit | 5b1e426929b40a9b60809284993b424b841a28fc (patch) | |
| tree | bd12300ad859bababb7d4acc03700fd31949fddc /ports/liblas | |
| parent | 279e25aecfe30f55296881ea9b0236c1d6ee030a (diff) | |
| parent | 358ec0954d9b71b0def4fd4b4dbafdd0b8478d81 (diff) | |
| download | vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.tar.gz vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.zip | |
Merge remote-tracking branch 'upstream/master' into path_separator
# Conflicts:
# scripts/cmake/vcpkg_common_definitions.cmake
Diffstat (limited to 'ports/liblas')
| -rw-r--r-- | ports/liblas/CONTROL | 2 | ||||
| -rw-r--r-- | ports/liblas/portfile.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ports/liblas/CONTROL b/ports/liblas/CONTROL index 4b983c937..9752f4e96 100644 --- a/ports/liblas/CONTROL +++ b/ports/liblas/CONTROL @@ -1,5 +1,5 @@ Source: liblas -Version: 1.8.1 +Version: 1.8.1-2 Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, libgeotiff Description: A C/C++ library for reading and writing the very common LAS LiDAR format. diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index 0ad91aa0d..9b7b90dd7 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -15,11 +15,13 @@ vcpkg_extract_source_archive_ex( PATCHES fix-BuildError.patch ) +file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake) # remove outdated module. There are probably more vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DBUILD_OSGEO4W=OFF # Disable osgeo4w -DWITH_TESTS=OFF -DWITH_UTILITIES=OFF |