aboutsummaryrefslogtreecommitdiff
path: root/ports/pdal
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-06-21 04:11:54 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-06-20 19:11:54 -0700
commit47d206e149e88201333b5ca8fe55c30e2b1a8177 (patch)
treec0620a39116333a6cb6ffc092983ba7114c6daf2 /ports/pdal
parente16efa4d6aa6f36247eb6dfd646fdf81af0c36e0 (diff)
downloadvcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.tar.gz
vcpkg-47d206e149e88201333b5ca8fe55c30e2b1a8177.zip
[many ports] improvements for linux/wsl (#6730)
* [many ports] improve compatibility with WSL and mixed case filesystems * [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there * [libharu] add compatibility with non-win32 platforms * [geogram] fix openblas on linux [clapack] better integration with linux environment [visit-struct] put cmake config file in the expected folder [geogram] remove trailing underscore to enable compatibility with OpenBLAS * [openblas] playing with underscore, without success * [openblas/lapack] fix library integration * [clapack] improve target handling in cmake module * [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs * [clapack,openblas] improve libraries integration * [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags * [suitesparse] improve integration with new lapack/openblas mechanism * [suitesparse] add no underscore postfix also for linux * [ceres] fix integration with newer openblas/lapack configs * [aws-c-event-stream] fix regression * [systemc] fix regression * [libwebp,geogram] trigger rebuild * [libwebp,pthread4w] fix regressions * [glbinding] fix cmake module installation * [globjects] disentangle unnecessary dependency from qt5 * [jasper] remove broken and unnecessary patches * [libwebp] fix regression * [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files * [clapack] correctly find dlls * [clapack] use a generic blas as dependency * [fizz,g2o] restore expected version * fix mistake * [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports * [libressl,openssl] do not try to build one if the other is already installed * [itk] update ref and patch to avoid regression * [libressl,openssl] implement full strategy to fix CI * [libwebp] disable components that are broken on macOS * [ogre] enable macOS build * [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169 * [ogre] add missing install command * [ffmpeg] enable wrapper for cmake module * [ffmpeg] add avresample module finder * [ffmpeg] improve module detection and exported symbols * [ffmpeg] add variables to cache * [thrift] remove unnecessary build option * [allegro5] fix shared/static inversion * [protobuf] cleanup * [libressl] cleanup * [moos-core] cleanup * commented features must not be separated from other features, otherwise vcpkg complains * [itk] fix regression * [shogun,itk] fix regressions * [ogre] fix regression * [opusfile] add compatibility with non-win32 * [itk] fix regression * [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile * add missing dependencies * [ismrmrd] fix regression * [ffmpeg] trigger rebuild * [clapack,openblas,libogg] fix regressions on macOS * [libtins] fix regression * force rebuild windows regressions, unable to reproduce locally * [mosquitto] enable non-win32 builds * [json-dto] force rebuild, unable to reproduce regression locally * [many ports] uniform naming and path length requests * fix regression * fix regression * [ffmpeg] fixes for downstream projects * clean up - thanks to reviewers * trigger rebuild of regressions on macOS * trigger rebuild of regressions on macOS - part2 * Add core back * Use VCPKG_CONCURRENCY * Add core back to suitesparse * Add core back to curl * Add core back to magnum * Add core back to magnum * Add core back to magnum * Add core back to cgal
Diffstat (limited to 'ports/pdal')
-rw-r--r--ports/pdal/CONTROL2
-rw-r--r--ports/pdal/portfile.cmake12
2 files changed, 7 insertions, 7 deletions
diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL
index 743f77c8e..7c465df4e 100644
--- a/ports/pdal/CONTROL
+++ b/ports/pdal/CONTROL
@@ -1,4 +1,4 @@
Source: pdal
-Version: 1.7.1-4
+Version: 1.7.1-5
Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.
Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
index 566fc08e4..650849224 100644
--- a/ports/pdal/portfile.cmake
+++ b/ports/pdal/portfile.cmake
@@ -27,26 +27,26 @@ file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp")
foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF FindCurl) # Outdated; Supplied by CMake
file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake")
endforeach()
-foreach(_module IN ITEMS FindGEOS) # Overwritten Modules.
+foreach(_module IN ITEMS FindGEOS) # Overwritten Modules.
file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake")
file(COPY ${CMAKE_CURRENT_LIST_DIR}/${_module}.cmake
DESTINATION ${SOURCE_PATH}/cmake/modules/
)
endforeach()
-# NOTE: CMake native BUILD_SHARED_LIBS option will be set by vcpkg_configure_cmake
-# TODO: Remove this as soon as PDAL switches to use BUILD_SHARED_LIBS
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- set(PDAL_BUILD_STATIC OFF)
+ set(VCPKG_BUILD_SHARED_LIBS ON)
+ set(VCPKG_BUILD_STATIC_LIBS OFF)
else()
- set(PDAL_BUILD_STATIC ON)
+ set(VCPKG_BUILD_SHARED_LIBS OFF)
+ set(VCPKG_BUILD_STATIC_LIBS ON)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- -DPDAL_BUILD_STATIC:BOOL=${PDAL_BUILD_STATIC}
+ -DPDAL_BUILD_STATIC:BOOL=${VCPKG_BUILD_STATIC_LIBS}
-DWITH_TESTS:BOOL=OFF
-DWITH_COMPLETION:BOOL=OFF
)