Merge branch 'master' into vcpkg_nuget

4 files changed, 20 insertions, 13 deletions

diff --git a/ports/pdal/0003-fix-copy-vendor.patch b/ports/pdal/0003-fix-copy-vendor.patch
index a29ad9018..3aad7af32 100644
--- a/ports/pdal/0003-fix-copy-vendor.patch
+++ b/ports/pdal/0003-fix-copy-vendor.patch
@@ -33,6 +33,15 @@ index 43e446a..c4c7d6f 100644
  

  #

  # CPACK

+@@ -348,7 +373,7 @@ add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)

+ 

+ export(

+     TARGETS

+-        ${PDAL_BASE_LIB_NAME} ${PDAL_UTIL_LIB_NAME}

++        ${PDAL_BASE_LIB_NAME} ${PDAL_ARBITER_LIB_NAME} ${PDAL_KAZHDAN_LIB_NAME} ${PDAL_UTIL_LIB_NAME}

+     FILE

+         "${PDAL_BINARY_DIR}/PDALTargets.cmake")

+ 

 diff --git a/cmake/directories.cmake b/cmake/directories.cmake

 index f079ec7..8e366e8 100644

 --- a/cmake/directories.cmake

diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL
index 743f77c8e..9dbec2ab9 100644
--- a/ports/pdal/CONTROL
+++ b/ports/pdal/CONTROL
@@ -1,4 +1,4 @@
 Source: pdal

-Version: 1.7.1-4

+Version: 1.7.1-6

 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/PDALConfig.patch b/ports/pdal/PDALConfig.patch
index ea7681dc1..25e9bfcbe 100644
--- a/ports/pdal/PDALConfig.patch
+++ b/ports/pdal/PDALConfig.patch
@@ -2,12 +2,13 @@ diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in
 index a03ef142e..2d06a2937 100644
 --- a/PDALConfig.cmake.in
 +++ b/PDALConfig.cmake.in	
-@@ -15,6 +15,8 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@)
+@@ -15,6 +15,9 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@)
    list(APPEND PDAL_LIBRARY_DIRS ${_foo})
  endforeach(_dir)
  
 +include(CMakeFindDependencyMacro)
 +find_dependency(GeoTIFF)
++find_dependency(CURL)
  include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake")
  
  if (WIN32)
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
index 566fc08e4..6961199a7 100644
--- a/ports/pdal/portfile.cmake
+++ b/ports/pdal/portfile.cmake
@@ -1,10 +1,7 @@
-# vcpkg portfile.cmake for PDAL
-#
-# NOTE: update the version string for new PDAL release
-set(PDAL_VERSION_STR "1.7.1")
-
 include(vcpkg_common_functions)
 
+set(PDAL_VERSION_STR "1.7.1")
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.osgeo.org/pdal/PDAL-${PDAL_VERSION_STR}-src.tar.gz"
     FILENAME "PDAL-${PDAL_VERSION_STR}-src.tar.gz"
@@ -27,26 +24,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
 )