From 38eacc94b4220280f0d5278b71a62eda291ac2aa Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 8 Nov 2021 20:33:36 +0100 Subject: [PATCH 01/33] Modernize portfile, use vcpkg_from_github --- ports/pdal/portfile.cmake | 54 +++++++++++++++++---------------------- ports/pdal/vcpkg.json | 10 +++++++- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 4fbabc1f0f7bae..f0e65382a96f6c 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -1,14 +1,9 @@ -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" - SHA512 e3e63bb05930c1a28c4f46c7edfaa8e9ea20484f1888d845b660a29a76f1dd1daea3db30a98607be0c2eeb86930ec8bfd0965d5d7d84b07a4fe4cb4512da9b09 -) - -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/PDAL + REF af6b7652117fbdb12c9f330570e8463e00058870 # 1.7.1 + SHA512 5e8a80de17f0c0e7fe6273d180d8736c08332e4a63a474cb052eb7eee3481c046bd587a13c4763dddb0f57e71a9eb673d3e68ce0d9107dd65c2050d6436bf6b0 + HEAD_REF master PATCHES 0001-win32_compiler_options.cmake.patch 0002-no-source-dir-writes.patch @@ -27,49 +22,48 @@ foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF FindCurl) # Outdated; Su endforeach() 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/ + file(COPY "${CMAKE_CURRENT_LIST_DIR}/${_module}.cmake" + DESTINATION "${SOURCE_PATH}/cmake/modules/" ) endforeach() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" VCPKG_BUILD_STATIC_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPDAL_BUILD_STATIC:BOOL=${VCPKG_BUILD_STATIC_LIBS} -DWITH_TESTS:BOOL=OFF -DWITH_COMPLETION:BOOL=OFF ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pdal/cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/pdal/cmake) vcpkg_copy_pdbs() # Install PDAL executable -file(GLOB _pdal_apps ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(COPY ${_pdal_apps} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/pdal) +file(GLOB _pdal_apps "${CURRENT_PACKAGES_DIR}/bin/*.exe") +file(COPY ${_pdal_apps} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pdal") file(REMOVE ${_pdal_apps}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") # Post-install clean-up file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib/pdal - ${CURRENT_PACKAGES_DIR}/debug/lib/pdal - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/lib/pdal" + "${CURRENT_PACKAGES_DIR}/debug/lib/pdal" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") else() - file(GLOB _pdal_bats ${CURRENT_PACKAGES_DIR}/bin/*.bat) + file(GLOB _pdal_bats "${CURRENT_PACKAGES_DIR}/bin/*.bat") file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_bats ${CURRENT_PACKAGES_DIR}/debug/bin/*.bat) + file(GLOB _pdal_bats "${CURRENT_PACKAGES_DIR}/debug/bin/*.bat") file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_apps ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(GLOB _pdal_apps "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") file(REMOVE ${_pdal_apps}) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 93d9cb70e9aae5..f5897aee31efb2 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -10,6 +10,14 @@ "geos", "jsoncpp", "laszip", - "libgeotiff" + "libgeotiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From 90329e888b05266ad8b1b9c57dc0ba3a0eab734c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 09:15:32 +0100 Subject: [PATCH 02/33] Revise cleanup and tool installation --- ports/pdal/portfile.cmake | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index f0e65382a96f6c..9191c186164692 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -41,11 +41,16 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/pdal/cmake) vcpkg_copy_pdbs() -# Install PDAL executable -file(GLOB _pdal_apps "${CURRENT_PACKAGES_DIR}/bin/*.exe") -file(COPY ${_pdal_apps} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pdal") -file(REMOVE ${_pdal_apps}) -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +# Install and cleanup executables +file(GLOB pdal_unsupported + "${CURRENT_PACKAGES_DIR}/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/bin/pdal-config" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.bat" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/pdal-config" +) +file(REMOVE ${pdal_unsupported}) +vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN) # Post-install clean-up file(REMOVE_RECURSE @@ -55,15 +60,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") -else() - file(GLOB _pdal_bats "${CURRENT_PACKAGES_DIR}/bin/*.bat") - file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_bats "${CURRENT_PACKAGES_DIR}/debug/bin/*.bat") - file(REMOVE ${_pdal_bats}) - file(GLOB _pdal_apps "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") - file(REMOVE ${_pdal_apps}) -endif() - file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From ba783e46058a0160d5021a9ac365ab859895b528 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 07:58:55 +0100 Subject: [PATCH 03/33] Fix static linkage with gdal --- ports/pdal/fix-dependency.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 352eb1d43f1b17..a07a3e706f71e4 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -44,6 +44,15 @@ index 42cca1e..43b0ced 100644 add_subdirectory(vendor/arbiter) add_subdirectory(vendor/kazhdan) if (NOT PDAL_HAVE_JSONCPP) +@@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} + target_link_libraries(${PDAL_BASE_LIB_NAME} + PUBLIC + ${CMAKE_THREAD_LIBS_INIT} +- ${GDAL_LIBRARY} ++ ${GDAL_LIBRARIES} + ${GEOS_LIBRARY} + ${GEOTIFF_LIBRARY} + ${LASZIP_LIBRARY} diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in index a03ef14..9d073e6 100644 --- a/PDALConfig.cmake.in From 0105bf3a9147e8c4c26f4bafe17e83ca04ce069a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 08:01:58 +0100 Subject: [PATCH 04/33] Fix static linkage with PostgreSQL --- ports/pdal/fix-dependency.patch | 18 ------------------ ports/pdal/libpq.patch | 33 --------------------------------- ports/pdal/portfile.cmake | 3 +-- 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 ports/pdal/libpq.patch diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index a07a3e706f71e4..303a9f70c068f3 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -14,24 +14,6 @@ index 90b79d9..5942ee5 100644 +find_package(geos CONFIG REQUIRED) +set(GEOS_LIBRARY GEOS::geos GEOS::geos_c GEOS::geos_cxx_flags) \ No newline at end of file -diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake -index 8178418..31b54d6 100644 ---- a/cmake/modules/FindPostgreSQL.cmake -+++ b/cmake/modules/FindPostgreSQL.cmake -@@ -80,4 +80,11 @@ find_package_handle_standard_args(PostgreSQL - POSTGRESQL_LIBRARIES - POSTGRESQL_VERSION) - --mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -+include (CMakeFindDependencyMacro) -+find_package(OpenSSL REQUIRED) -+set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto) -+if (WIN32) -+ set(POSTGRESQL_LIBRARIES ${POSTGRESQL_LIBRARIES} Secur32) -+endif() -+ -+mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) -\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 42cca1e..43b0ced 100644 --- a/CMakeLists.txt diff --git a/ports/pdal/libpq.patch b/ports/pdal/libpq.patch deleted file mode 100644 index 3aac2188cd0f90..00000000000000 --- a/ports/pdal/libpq.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cmake/postgres.cmake b/cmake/postgres.cmake -index 0dad71069..32fdae2f8 100644 ---- a/cmake/postgres.cmake -+++ b/cmake/postgres.cmake -@@ -7,3 +7,27 @@ find_package(PostgreSQL REQUIRED) - mark_as_advanced(CLEAR POSTGRESQL_INCLUDE_DIR) - mark_as_advanced(CLEAR POSTGRESQL_LIBRARIES) - include_directories(${POSTGRESQL_INCLUDE_DIR}) -+ -+include(SelectLibraryConfigurations) -+ -+find_library(PostgreSQLCommon_LIBRARY_DEBUG -+NAMES libpgcommond pgcommond pgcommon libpgcommon -+NAMES_PER_DIR -+) -+find_library(PostgreSQLCommon_LIBRARY_RELEASE -+NAMES pgcommon libpgcommon -+NAMES_PER_DIR -+) -+select_library_configurations(PostgreSQLCommon) -+ -+find_library(PostgreSQLPort_LIBRARY_DEBUG -+NAMES pgportd libpgportd pgport libpgport -+NAMES_PER_DIR -+) -+find_library(PostgreSQLPort_LIBRARY_RELEASE -+NAMES pgport libpgport -+NAMES_PER_DIR -+) -+select_library_configurations(PostgreSQLPort) -+ -+list(APPEND POSTGRESQL_LIBRARIES ${PostgreSQLPort_LIBRARIES} ${PostgreSQLCommon_LIBRARIES}) -\ No newline at end of file diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 9191c186164692..5df2b7466ef976 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -9,7 +9,6 @@ vcpkg_from_github( 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch fix-dependency.patch - libpq.patch fix-CPL_DLL.patch 0004-fix-const-overloaded.patch ) @@ -17,7 +16,7 @@ vcpkg_from_github( file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") # Deploy custom CMake modules to enforce expected dependencies look-up -foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF FindCurl) # Outdated; Supplied by CMake +foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF FindCurl FindPostgreSQL) # Outdated; Supplied by CMake file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake") endforeach() foreach(_module IN ITEMS FindGEOS) # Overwritten Modules. From 586e824612947f3d45ee12f65e9f1a2b33cabe8a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 08:44:04 +0100 Subject: [PATCH 05/33] Fix compiler options --- ports/pdal/fix-unix-compiler-options.patch | 12 ++++++++++++ ports/pdal/portfile.cmake | 1 + 2 files changed, 13 insertions(+) create mode 100644 ports/pdal/fix-unix-compiler-options.patch diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch new file mode 100644 index 00000000000000..f93236b4cdf934 --- /dev/null +++ b/ports/pdal/fix-unix-compiler-options.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/unix_compiler_options.cmake b/cmake/unix_compiler_options.cmake +index 035a2b9..650de8f 100644 +--- a/cmake/unix_compiler_options.cmake ++++ b/cmake/unix_compiler_options.cmake +@@ -24,7 +24,6 @@ function(PDAL_TARGET_COMPILE_SETTINGS target) + ${PDAL_CXX_STANDARD} + -Wextra + -Wpedantic +- -Werror + -Wall + -Wno-unused-parameter + -Wno-unused-variable diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 5df2b7466ef976..32ef8127eaac74 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch fix-dependency.patch + fix-unix-compiler-options.patch fix-CPL_DLL.patch 0004-fix-const-overloaded.patch ) From eea60d95f801b3f5484d2d1ead85eb9451551a3f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 09:47:32 +0100 Subject: [PATCH 06/33] Fix APPLE linker flags --- ports/pdal/fix-unix-compiler-options.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch index f93236b4cdf934..1ef13cddef4242 100644 --- a/ports/pdal/fix-unix-compiler-options.patch +++ b/ports/pdal/fix-unix-compiler-options.patch @@ -1,3 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 679b4e7..08965d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,7 +187,7 @@ add_subdirectory(apps) + # so that users only need link libpdalcpp. + # + if (APPLE) +- set(PDAL_REEXPORT "-Wl,-reexport_library,$") ++ set(PDAL_REEXPORT "-Wl$-reexport_library$$") + # + # This allows the rpath reference for the reexported library (above) to + # be found. diff --git a/cmake/unix_compiler_options.cmake b/cmake/unix_compiler_options.cmake index 035a2b9..650de8f 100644 --- a/cmake/unix_compiler_options.cmake From 344d7340defb6f212641ea0ba821311bab4caa86 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 11:40:08 +0100 Subject: [PATCH 07/33] Don't use /usr/local/include --- ports/pdal/fix-unix-compiler-options.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch index 1ef13cddef4242..d3889305a12ac0 100644 --- a/ports/pdal/fix-unix-compiler-options.patch +++ b/ports/pdal/fix-unix-compiler-options.patch @@ -12,7 +12,7 @@ index 679b4e7..08965d9 100644 # This allows the rpath reference for the reexported library (above) to # be found. diff --git a/cmake/unix_compiler_options.cmake b/cmake/unix_compiler_options.cmake -index 035a2b9..650de8f 100644 +index 035a2b9..3e6058b 100644 --- a/cmake/unix_compiler_options.cmake +++ b/cmake/unix_compiler_options.cmake @@ -24,7 +24,6 @@ function(PDAL_TARGET_COMPILE_SETTINGS target) @@ -23,3 +23,9 @@ index 035a2b9..650de8f 100644 -Wall -Wno-unused-parameter -Wno-unused-variable +@@ -36,5 +35,4 @@ function(PDAL_TARGET_COMPILE_SETTINGS target) + -Wno-unknown-pragmas + -Wno-deprecated-declarations + ) +- target_include_directories(${target} SYSTEM PUBLIC /usr/local/include) + endfunction() From bd55533d34d78d98dcf3b5ce7ba26dc5535820f9 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 09:16:52 +0100 Subject: [PATCH 08/33] Remove pdal failure from CI baseline --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bbcb9d010a8a1d..ee3ed3561b50c0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1140,8 +1140,6 @@ paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail pango:x64-windows-static-md=fail pangomm:arm64-windows=fail -pdal:x64-linux=fail -pdal:x64-osx=fail pdal-c:x64-windows-static=fail pdal-c:x64-windows-static-md=fail pdcurses:arm-uwp=fail From a121bd75bccdd8faf78e70c881a9ede75a20f838 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 13:14:58 +0100 Subject: [PATCH 09/33] Remove outdated FindICONV.cmake --- ports/pdal/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 32ef8127eaac74..cac9782e07bb93 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_from_github( file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") # Deploy custom CMake modules to enforce expected dependencies look-up -foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF FindCurl FindPostgreSQL) # Outdated; Supplied by CMake - file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake") +foreach(package IN ITEMS Curl GDAL GEOS GeoTIFF ICONV PostgreSQL) # Outdated; Supplied by CMake + file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() foreach(_module IN ITEMS FindGEOS) # Overwritten Modules. file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake") From b30a2117eb9502213dfd09febe2226cd0d617584 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 22:22:55 +0100 Subject: [PATCH 10/33] Simplify geos package lookup --- ports/pdal/FindGEOS.cmake | 13 ------------- ports/pdal/fix-dependency.patch | 7 +++---- ports/pdal/portfile.cmake | 10 ++-------- 3 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 ports/pdal/FindGEOS.cmake diff --git a/ports/pdal/FindGEOS.cmake b/ports/pdal/FindGEOS.cmake deleted file mode 100644 index 88d17b0733d0d1..00000000000000 --- a/ports/pdal/FindGEOS.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(GEOS_INCLUDE_DIR geos_c.h) - -find_library(GEOS_LIBRARY_DEBUG NAMES geos_cd) -find_library(GEOS_LIBRARY_RELEASE NAMES geos_c) - -include(SelectLibraryConfigurations) -select_library_configurations(GEOS) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - GEOS DEFAULT_MSG - GEOS_LIBRARY GEOS_INCLUDE_DIR -) diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 303a9f70c068f3..3db80ea855686c 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -11,9 +11,8 @@ index 90b79d9..5942ee5 100644 - PURPOSE "Provides general purpose geometry support") - -include_directories("${GEOS_INCLUDE_DIR}") -+find_package(geos CONFIG REQUIRED) -+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c GEOS::geos_cxx_flags) -\ No newline at end of file ++find_package(GEOS CONFIG REQUIRED) ++set(GEOS_LIBRARY GEOS::geos) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42cca1e..43b0ced 100644 --- a/CMakeLists.txt @@ -47,7 +46,7 @@ index a03ef14..9d073e6 100644 +find_dependency(GeoTIFF) +find_dependency(CURL) +find_dependency(Boost COMPONENTS system filesystem) -+find_dependency(geos CONFIG) ++find_dependency(GEOS CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") if (WIN32) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index cac9782e07bb93..3d45450dadf057 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -16,16 +16,10 @@ vcpkg_from_github( file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") -# Deploy custom CMake modules to enforce expected dependencies look-up -foreach(package IN ITEMS Curl GDAL GEOS GeoTIFF ICONV PostgreSQL) # Outdated; Supplied by CMake +# Prefer pristine CMake find modules + wrappers and config files from vcpkg. +foreach(package IN ITEMS Curl GDAL GEOS GeoTIFF ICONV PostgreSQL) file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() -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() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" VCPKG_BUILD_STATIC_LIBS) From d376657582eee5da0fc03bb1326478ea17cf2e50 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 22:57:15 +0100 Subject: [PATCH 11/33] Separate boost patch from other dependencies --- ports/pdal/fix-dependency.patch | 184 +---------------------------- ports/pdal/portfile.cmake | 1 + ports/pdal/use-vcpkg-boost.patch | 193 +++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+), 181 deletions(-) create mode 100644 ports/pdal/use-vcpkg-boost.patch diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 3db80ea855686c..1a30d0d49c8db6 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -17,14 +17,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 42cca1e..43b0ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -174,7 +174,6 @@ if (WITH_TESTS) - add_subdirectory(test) - endif() - add_subdirectory(dimbuilder) --add_subdirectory(vendor/pdalboost) - add_subdirectory(vendor/arbiter) - add_subdirectory(vendor/kazhdan) - if (NOT PDAL_HAVE_JSONCPP) @@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} target_link_libraries(${PDAL_BASE_LIB_NAME} PUBLIC @@ -38,184 +30,14 @@ diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in index a03ef14..9d073e6 100644 --- a/PDALConfig.cmake.in +++ b/PDALConfig.cmake.in -@@ -15,6 +15,11 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) +@@ -15,6 +15,10 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) list(APPEND PDAL_LIBRARY_DIRS ${_foo}) endforeach(_dir) +include(CMakeFindDependencyMacro) -+find_dependency(GeoTIFF) -+find_dependency(CURL) -+find_dependency(Boost COMPONENTS system filesystem) ++find_dependency(CURL CONFIG) +find_dependency(GEOS CONFIG) ++find_dependency(GeoTIFF CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") if (WIN32) -diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 19a2dd1..d498080 100644 ---- a/pdal/util/CMakeLists.txt -+++ b/pdal/util/CMakeLists.txt -@@ -8,6 +8,8 @@ endif() - - include(${PDAL_CMAKE_DIR}/execinfo.cmake) - -+find_package(Boost COMPONENTS system filesystem REQUIRED) -+ - set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Bounds.cpp" - "${PDAL_UTIL_DIR}/Charbuf.cpp" -@@ -16,14 +18,14 @@ set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Utils.cpp" - ) - --PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES}) -+PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} ${PDAL_UTIL_SOURCES}) - target_link_libraries(${PDAL_UTIL_LIB_NAME} - PRIVATE - ${EXECINFO_LIBRARY} -- ${PDAL_BOOST_LIB_NAME} -+ PUBLIC -+ Boost::system -+ Boost::filesystem - ) --target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE -- ${PDAL_VENDOR_DIR}/pdalboost) - - if (UNIX AND NOT APPLE) - target_link_libraries(${PDAL_UTIL_LIB_NAME} -diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp -index 7679f22..b18b674 100644 ---- a/pdal/util/FileUtils.cpp -+++ b/pdal/util/FileUtils.cpp -@@ -124,19 +124,19 @@ std::ostream *createFile(std::string const& name, bool asBinary) - bool directoryExists(const std::string& dirname) - { - //ABELL - Seems we should be calling is_directory -- return pdalboost::filesystem::exists(dirname); -+ return boost::filesystem::exists(dirname); - } - - - bool createDirectory(const std::string& dirname) - { -- return pdalboost::filesystem::create_directory(dirname); -+ return boost::filesystem::create_directory(dirname); - } - - - void deleteDirectory(const std::string& dirname) - { -- pdalboost::filesystem::remove_all(dirname); -+ boost::filesystem::remove_all(dirname); - } - - -@@ -146,15 +146,15 @@ std::vector directoryList(const std::string& dir) - - try - { -- pdalboost::filesystem::directory_iterator it(dir); -- pdalboost::filesystem::directory_iterator end; -+ boost::filesystem::directory_iterator it(dir); -+ boost::filesystem::directory_iterator end; - while (it != end) - { - files.push_back(it->path().string()); - it++; - } - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - files.clear(); - } -@@ -194,13 +194,13 @@ void closeFile(std::istream* in) - - bool deleteFile(const std::string& file) - { -- return pdalboost::filesystem::remove(file); -+ return boost::filesystem::remove(file); - } - - - void renameFile(const std::string& dest, const std::string& src) - { -- pdalboost::filesystem::rename(src, dest); -+ boost::filesystem::rename(src, dest); - } - - -@@ -211,9 +211,9 @@ bool fileExists(const std::string& name) - - try - { -- return pdalboost::filesystem::exists(name); -+ return boost::filesystem::exists(name); - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - } - return false; -@@ -222,7 +222,7 @@ bool fileExists(const std::string& name) - - uintmax_t fileSize(const std::string& file) - { -- return pdalboost::filesystem::file_size(file); -+ return boost::filesystem::file_size(file); - } - - -@@ -243,7 +243,7 @@ std::string readFileIntoString(const std::string& filename) - - std::string getcwd() - { -- const pdalboost::filesystem::path p = pdalboost::filesystem::current_path(); -+ const boost::filesystem::path p = boost::filesystem::current_path(); - return addTrailingSlash(p.string()); - } - -@@ -271,7 +271,7 @@ std::string toAbsolutePath(const std::string& filename) - // otherwise, make it absolute (relative to current working dir) and return that - std::string toAbsolutePath(const std::string& filename) - { -- return pdalboost::filesystem::absolute(filename).string(); -+ return boost::filesystem::absolute(filename).string(); - } - - -@@ -283,7 +283,7 @@ std::string toAbsolutePath(const std::string& filename) - std::string toAbsolutePath(const std::string& filename, const std::string base) - { - const std::string newbase = toAbsolutePath(base); -- return pdalboost::filesystem::absolute(filename, newbase).string(); -+ return boost::filesystem::absolute(filename, newbase).string(); - } - - std::string getFilename(const std::string& path) -@@ -304,8 +304,8 @@ std::string getFilename(const std::string& path) - // Get the directory part of a filename. - std::string getDirectory(const std::string& path) - { -- const pdalboost::filesystem::path dir = -- pdalboost::filesystem::path(path).parent_path(); -+ const boost::filesystem::path dir = -+ boost::filesystem::path(path).parent_path(); - return addTrailingSlash(dir.string()); - } - -@@ -326,13 +326,13 @@ std::string stem(const std::string& path) - // Determine if the path represents a directory. - bool isDirectory(const std::string& path) - { -- return pdalboost::filesystem::is_directory(path); -+ return boost::filesystem::is_directory(path); - } - - // Determine if the path is an absolute path - bool isAbsolutePath(const std::string& path) - { -- return pdalboost::filesystem::path(path).is_absolute(); -+ return boost::filesystem::path(path).is_absolute(); - } - - diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 3d45450dadf057..6c3e93b4664180 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch fix-dependency.patch + use-vcpkg-boost.patch fix-unix-compiler-options.patch fix-CPL_DLL.patch 0004-fix-const-overloaded.patch diff --git a/ports/pdal/use-vcpkg-boost.patch b/ports/pdal/use-vcpkg-boost.patch new file mode 100644 index 00000000000000..886aa08b9d5e97 --- /dev/null +++ b/ports/pdal/use-vcpkg-boost.patch @@ -0,0 +1,193 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2adc310..679b4e7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,6 @@ if (WITH_TESTS) + add_subdirectory(test) + endif() + add_subdirectory(dimbuilder) +-add_subdirectory(vendor/pdalboost) + add_subdirectory(vendor/arbiter) + add_subdirectory(vendor/kazhdan) + if (NOT PDAL_HAVE_JSONCPP) +diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in +index bf6137e..890a8ac 100644 +--- a/PDALConfig.cmake.in ++++ b/PDALConfig.cmake.in +@@ -16,6 +16,7 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) + endforeach(_dir) + + include(CMakeFindDependencyMacro) ++find_dependency(Boost COMPONENTS system filesystem) + find_dependency(CURL CONFIG) + find_dependency(GEOS CONFIG) + find_dependency(GeoTIFF CONFIG) +diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt +index 19a2dd1..d498080 100644 +--- a/pdal/util/CMakeLists.txt ++++ b/pdal/util/CMakeLists.txt +@@ -8,6 +8,8 @@ endif() + + include(${PDAL_CMAKE_DIR}/execinfo.cmake) + ++find_package(Boost COMPONENTS system filesystem REQUIRED) ++ + set(PDAL_UTIL_SOURCES + "${PDAL_UTIL_DIR}/Bounds.cpp" + "${PDAL_UTIL_DIR}/Charbuf.cpp" +@@ -16,14 +18,14 @@ set(PDAL_UTIL_SOURCES + "${PDAL_UTIL_DIR}/Utils.cpp" + ) + +-PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES}) ++PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} ${PDAL_UTIL_SOURCES}) + target_link_libraries(${PDAL_UTIL_LIB_NAME} + PRIVATE + ${EXECINFO_LIBRARY} +- ${PDAL_BOOST_LIB_NAME} ++ PUBLIC ++ Boost::system ++ Boost::filesystem + ) +-target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE +- ${PDAL_VENDOR_DIR}/pdalboost) + + if (UNIX AND NOT APPLE) + target_link_libraries(${PDAL_UTIL_LIB_NAME} +diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp +index 7679f22..b18b674 100644 +--- a/pdal/util/FileUtils.cpp ++++ b/pdal/util/FileUtils.cpp +@@ -124,19 +124,19 @@ std::ostream *createFile(std::string const& name, bool asBinary) + bool directoryExists(const std::string& dirname) + { + //ABELL - Seems we should be calling is_directory +- return pdalboost::filesystem::exists(dirname); ++ return boost::filesystem::exists(dirname); + } + + + bool createDirectory(const std::string& dirname) + { +- return pdalboost::filesystem::create_directory(dirname); ++ return boost::filesystem::create_directory(dirname); + } + + + void deleteDirectory(const std::string& dirname) + { +- pdalboost::filesystem::remove_all(dirname); ++ boost::filesystem::remove_all(dirname); + } + + +@@ -146,15 +146,15 @@ std::vector directoryList(const std::string& dir) + + try + { +- pdalboost::filesystem::directory_iterator it(dir); +- pdalboost::filesystem::directory_iterator end; ++ boost::filesystem::directory_iterator it(dir); ++ boost::filesystem::directory_iterator end; + while (it != end) + { + files.push_back(it->path().string()); + it++; + } + } +- catch (pdalboost::filesystem::filesystem_error) ++ catch (boost::filesystem::filesystem_error) + { + files.clear(); + } +@@ -194,13 +194,13 @@ void closeFile(std::istream* in) + + bool deleteFile(const std::string& file) + { +- return pdalboost::filesystem::remove(file); ++ return boost::filesystem::remove(file); + } + + + void renameFile(const std::string& dest, const std::string& src) + { +- pdalboost::filesystem::rename(src, dest); ++ boost::filesystem::rename(src, dest); + } + + +@@ -211,9 +211,9 @@ bool fileExists(const std::string& name) + + try + { +- return pdalboost::filesystem::exists(name); ++ return boost::filesystem::exists(name); + } +- catch (pdalboost::filesystem::filesystem_error) ++ catch (boost::filesystem::filesystem_error) + { + } + return false; +@@ -222,7 +222,7 @@ bool fileExists(const std::string& name) + + uintmax_t fileSize(const std::string& file) + { +- return pdalboost::filesystem::file_size(file); ++ return boost::filesystem::file_size(file); + } + + +@@ -243,7 +243,7 @@ std::string readFileIntoString(const std::string& filename) + + std::string getcwd() + { +- const pdalboost::filesystem::path p = pdalboost::filesystem::current_path(); ++ const boost::filesystem::path p = boost::filesystem::current_path(); + return addTrailingSlash(p.string()); + } + +@@ -271,7 +271,7 @@ std::string toAbsolutePath(const std::string& filename) + // otherwise, make it absolute (relative to current working dir) and return that + std::string toAbsolutePath(const std::string& filename) + { +- return pdalboost::filesystem::absolute(filename).string(); ++ return boost::filesystem::absolute(filename).string(); + } + + +@@ -283,7 +283,7 @@ std::string toAbsolutePath(const std::string& filename) + std::string toAbsolutePath(const std::string& filename, const std::string base) + { + const std::string newbase = toAbsolutePath(base); +- return pdalboost::filesystem::absolute(filename, newbase).string(); ++ return boost::filesystem::absolute(filename, newbase).string(); + } + + std::string getFilename(const std::string& path) +@@ -304,8 +304,8 @@ std::string getFilename(const std::string& path) + // Get the directory part of a filename. + std::string getDirectory(const std::string& path) + { +- const pdalboost::filesystem::path dir = +- pdalboost::filesystem::path(path).parent_path(); ++ const boost::filesystem::path dir = ++ boost::filesystem::path(path).parent_path(); + return addTrailingSlash(dir.string()); + } + +@@ -326,13 +326,13 @@ std::string stem(const std::string& path) + // Determine if the path represents a directory. + bool isDirectory(const std::string& path) + { +- return pdalboost::filesystem::is_directory(path); ++ return boost::filesystem::is_directory(path); + } + + // Determine if the path is an absolute path + bool isAbsolutePath(const std::string& path) + { +- return pdalboost::filesystem::path(path).is_absolute(); ++ return boost::filesystem::path(path).is_absolute(); + } + + From 3140bfbc7b5de3a231f615b3526ad1cadfccc34f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 23:42:13 +0100 Subject: [PATCH 12/33] Simplify boost patching --- ports/pdal/use-vcpkg-boost.patch | 151 +++---------------------------- 1 file changed, 14 insertions(+), 137 deletions(-) diff --git a/ports/pdal/use-vcpkg-boost.patch b/ports/pdal/use-vcpkg-boost.patch index 886aa08b9d5e97..6f4fb89cd74285 100644 --- a/ports/pdal/use-vcpkg-boost.patch +++ b/ports/pdal/use-vcpkg-boost.patch @@ -18,7 +18,7 @@ index bf6137e..890a8ac 100644 endforeach(_dir) include(CMakeFindDependencyMacro) -+find_dependency(Boost COMPONENTS system filesystem) ++find_dependency(Boost COMPONENTS filesystem) find_dependency(CURL CONFIG) find_dependency(GEOS CONFIG) find_dependency(GeoTIFF CONFIG) @@ -26,16 +26,17 @@ diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt index 19a2dd1..d498080 100644 --- a/pdal/util/CMakeLists.txt +++ b/pdal/util/CMakeLists.txt -@@ -8,6 +8,8 @@ endif() +@@ -8,6 +8,9 @@ endif() include(${PDAL_CMAKE_DIR}/execinfo.cmake) -+find_package(Boost COMPONENTS system filesystem REQUIRED) ++find_package(Boost COMPONENTS filesystem REQUIRED) ++set(PDAL_BOOST_LIB_NAME Boost::filesystem) + set(PDAL_UTIL_SOURCES "${PDAL_UTIL_DIR}/Bounds.cpp" "${PDAL_UTIL_DIR}/Charbuf.cpp" -@@ -16,14 +18,14 @@ set(PDAL_UTIL_SOURCES +@@ -16,14 +19,12 @@ set(PDAL_UTIL_SOURCES "${PDAL_UTIL_DIR}/Utils.cpp" ) @@ -44,10 +45,7 @@ index 19a2dd1..d498080 100644 target_link_libraries(${PDAL_UTIL_LIB_NAME} PRIVATE ${EXECINFO_LIBRARY} -- ${PDAL_BOOST_LIB_NAME} -+ PUBLIC -+ Boost::system -+ Boost::filesystem + ${PDAL_BOOST_LIB_NAME} ) -target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE - ${PDAL_VENDOR_DIR}/pdalboost) @@ -58,136 +56,15 @@ diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp index 7679f22..b18b674 100644 --- a/pdal/util/FileUtils.cpp +++ b/pdal/util/FileUtils.cpp -@@ -124,19 +124,19 @@ std::ostream *createFile(std::string const& name, bool asBinary) - bool directoryExists(const std::string& dirname) - { - //ABELL - Seems we should be calling is_directory -- return pdalboost::filesystem::exists(dirname); -+ return boost::filesystem::exists(dirname); - } - - - bool createDirectory(const std::string& dirname) - { -- return pdalboost::filesystem::create_directory(dirname); -+ return boost::filesystem::create_directory(dirname); - } - - - void deleteDirectory(const std::string& dirname) - { -- pdalboost::filesystem::remove_all(dirname); -+ boost::filesystem::remove_all(dirname); - } - - -@@ -146,15 +146,15 @@ std::vector directoryList(const std::string& dir) - - try - { -- pdalboost::filesystem::directory_iterator it(dir); -- pdalboost::filesystem::directory_iterator end; -+ boost::filesystem::directory_iterator it(dir); -+ boost::filesystem::directory_iterator end; - while (it != end) - { - files.push_back(it->path().string()); - it++; - } - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - files.clear(); - } -@@ -194,13 +194,13 @@ void closeFile(std::istream* in) - - bool deleteFile(const std::string& file) - { -- return pdalboost::filesystem::remove(file); -+ return boost::filesystem::remove(file); - } - - - void renameFile(const std::string& dest, const std::string& src) - { -- pdalboost::filesystem::rename(src, dest); -+ boost::filesystem::rename(src, dest); - } - - -@@ -211,9 +211,9 @@ bool fileExists(const std::string& name) +@@ -74,6 +74,11 @@ std::string addTrailingSlash(std::string path) - try - { -- return pdalboost::filesystem::exists(name); -+ return boost::filesystem::exists(name); - } -- catch (pdalboost::filesystem::filesystem_error) -+ catch (boost::filesystem::filesystem_error) - { - } - return false; -@@ -222,7 +222,7 @@ bool fileExists(const std::string& name) + } // unnamed namespace - uintmax_t fileSize(const std::string& file) - { -- return pdalboost::filesystem::file_size(file); -+ return boost::filesystem::file_size(file); - } - - -@@ -243,7 +243,7 @@ std::string readFileIntoString(const std::string& filename) - - std::string getcwd() - { -- const pdalboost::filesystem::path p = pdalboost::filesystem::current_path(); -+ const boost::filesystem::path p = boost::filesystem::current_path(); - return addTrailingSlash(p.string()); - } - -@@ -271,7 +271,7 @@ std::string toAbsolutePath(const std::string& filename) - // otherwise, make it absolute (relative to current working dir) and return that - std::string toAbsolutePath(const std::string& filename) - { -- return pdalboost::filesystem::absolute(filename).string(); -+ return boost::filesystem::absolute(filename).string(); - } - - -@@ -283,7 +283,7 @@ std::string toAbsolutePath(const std::string& filename) - std::string toAbsolutePath(const std::string& filename, const std::string base) - { - const std::string newbase = toAbsolutePath(base); -- return pdalboost::filesystem::absolute(filename, newbase).string(); -+ return boost::filesystem::absolute(filename, newbase).string(); - } - - std::string getFilename(const std::string& path) -@@ -304,8 +304,8 @@ std::string getFilename(const std::string& path) - // Get the directory part of a filename. - std::string getDirectory(const std::string& path) - { -- const pdalboost::filesystem::path dir = -- pdalboost::filesystem::path(path).parent_path(); -+ const boost::filesystem::path dir = -+ boost::filesystem::path(path).parent_path(); - return addTrailingSlash(dir.string()); - } - -@@ -326,13 +326,13 @@ std::string stem(const std::string& path) - // Determine if the path represents a directory. - bool isDirectory(const std::string& path) - { -- return pdalboost::filesystem::is_directory(path); -+ return boost::filesystem::is_directory(path); - } - - // Determine if the path is an absolute path - bool isAbsolutePath(const std::string& path) ++namespace pdalboost ++{ ++ namespace filesystem = boost::filesystem; ++} ++ + namespace FileUtils { -- return pdalboost::filesystem::path(path).is_absolute(); -+ return boost::filesystem::path(path).is_absolute(); - } - From 3c4e1881c79e23a2a071dfa5b2257cff2c79820a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 22:06:36 +0100 Subject: [PATCH 13/33] Update to 2.3.0 --- .../0001-win32_compiler_options.cmake.patch | 14 -------- ports/pdal/0002-no-source-dir-writes.patch | 28 ---------------- ports/pdal/0003-fix-copy-vendor.patch | 19 +++++++++++ ports/pdal/0004-fix-const-overloaded.patch | 13 -------- ports/pdal/fix-CPL_DLL.patch | 15 --------- ports/pdal/fix-dependency.patch | 28 ++++------------ ports/pdal/fix-unix-compiler-options.patch | 18 ---------- ports/pdal/portfile.cmake | 17 +++++----- ports/pdal/use-vcpkg-boost.patch | 33 ++++++++++--------- ports/pdal/vcpkg.json | 3 +- 10 files changed, 52 insertions(+), 136 deletions(-) delete mode 100644 ports/pdal/0001-win32_compiler_options.cmake.patch delete mode 100644 ports/pdal/0004-fix-const-overloaded.patch delete mode 100644 ports/pdal/fix-CPL_DLL.patch diff --git a/ports/pdal/0001-win32_compiler_options.cmake.patch b/ports/pdal/0001-win32_compiler_options.cmake.patch deleted file mode 100644 index 8486cc1cd97c20..00000000000000 --- a/ports/pdal/0001-win32_compiler_options.cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nuar a/cmake/win32_compiler_options.cmake b/cmake/win32_compiler_options.cmake ---- a/cmake/win32_compiler_options.cmake 2018-04-06 20:24:17.000000000 +0200 -+++ b/cmake/win32_compiler_options.cmake 2018-04-28 19:40:54.534593200 +0200 -@@ -67,10 +67,6 @@ - endif() - endif() - --set(CMAKE_INCLUDE_PATH "c:/OSGeo4W64/include;$ENV{CMAKE_INCLUDE_PATH}") --set(CMAKE_LIBRARY_PATH "c:/OSGeo4W64/lib;$ENV{CMAKE_LIBRARY_PATH}") --set(CMAKE_PREFIX_PATH "c:/OSGeo4W64/cmake;$ENV{CMAKE_LIBRARY_PATH}") -- - #ABELL (& gadomski) - WHY? - set(PDAL_PLATFORM_WIN32 1) - set(WINSOCK_LIBRARY ws2_32) diff --git a/ports/pdal/0002-no-source-dir-writes.patch b/ports/pdal/0002-no-source-dir-writes.patch index f7ec12f6bfba81..f739cdf7dc794f 100644 --- a/ports/pdal/0002-no-source-dir-writes.patch +++ b/ports/pdal/0002-no-source-dir-writes.patch @@ -19,31 +19,3 @@ index dc146d1..9b82544 100644 ${PDAL_SRC_DIR}/compression/*.cpp) file(GLOB_RECURSE PRIVATE_SRCS ${PDAL_FILTERS_DIR}/private/*.cpp -diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt -index b02aa4a..d60b041 100644 ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -66,9 +66,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc - if(UNIX OR APPLE) - # Autoconf compatibility variables to use the same script source. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.in" -- "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config" @ONLY) -+ "${CMAKE_CURRENT_BINARY_DIR}/pdal-config" @ONLY) - -- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config" -+ file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config" - DESTINATION - "${PDAL_OUTPUT_BIN_DIR}/" - FILE_PERMISSIONS -@@ -85,9 +85,9 @@ if(UNIX OR APPLE) - elseif(WIN32) - # Autoconf compatibility variables to use the same script source. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pdal-config-bat.in" -- "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat" @ONLY) -+ "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat" @ONLY) - -- file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pdal-config.bat" -+ file(COPY "${CMAKE_CURRENT_BINARY_DIR}/pdal-config.bat" - DESTINATION - "${PDAL_OUTPUT_BIN_DIR}/" - FILE_PERMISSIONS diff --git a/ports/pdal/0003-fix-copy-vendor.patch b/ports/pdal/0003-fix-copy-vendor.patch index 3aad7af320a9e9..995de044518dc8 100644 --- a/ports/pdal/0003-fix-copy-vendor.patch +++ b/ports/pdal/0003-fix-copy-vendor.patch @@ -57,3 +57,22 @@ index f079ec7..8e366e8 100644 +set(PDAL_VENDOR_NANOFLANN_DIR ${PDAL_VENDOR_DIR}/nanoflann) \ No newline at end of file +diff --git a/cmake/macros.cmake b/cmake/macros.cmake +index 3091544..4c65311 100644 +--- a/cmake/macros.cmake ++++ b/cmake/macros.cmake +@@ -77,12 +77,13 @@ macro(PDAL_ADD_FREE_LIBRARY _name _library_type) + # Don't install static libraries - they're already built into libpdalXXX + if (NOT ${_library_type} STREQUAL "STATIC") + target_compile_definitions(${_name} PRIVATE PDAL_DLL_EXPORT) ++ endif() ++ if (1) + install(TARGETS ${_name} + EXPORT PDALTargets + RUNTIME DESTINATION ${PDAL_BIN_INSTALL_DIR} + LIBRARY DESTINATION ${PDAL_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR}) +- else() + set_target_properties(${_name} PROPERTIES + POSITION_INDEPENDENT_CODE TRUE) + endif() diff --git a/ports/pdal/0004-fix-const-overloaded.patch b/ports/pdal/0004-fix-const-overloaded.patch deleted file mode 100644 index 1f820aef340053..00000000000000 --- a/ports/pdal/0004-fix-const-overloaded.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pdal/PointViewIter.hpp b/pdal/PointViewIter.hpp -index 0c387be..ccb0721 100644 ---- a/pdal/PointViewIter.hpp -+++ b/pdal/PointViewIter.hpp -@@ -139,7 +139,7 @@ public: - - bool operator==(const PointViewIter& i) - { return m_id == i.m_id; } -- bool operator!=(const PointViewIter& i) -+ bool operator!=(const PointViewIter& i) const - { return m_id != i.m_id; } - bool operator<=(const PointViewIter& i) - { return m_id <= i.m_id; } diff --git a/ports/pdal/fix-CPL_DLL.patch b/ports/pdal/fix-CPL_DLL.patch deleted file mode 100644 index ef7c2647273194..00000000000000 --- a/ports/pdal/fix-CPL_DLL.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/io/GeotiffSupport.cpp b/io/GeotiffSupport.cpp -index 7b75818..909992d 100644 ---- a/io/GeotiffSupport.cpp -+++ b/io/GeotiffSupport.cpp -@@ -43,8 +43,8 @@ PDAL_C_START - - // These functions are available from GDAL, but they - // aren't exported. --char CPL_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); --int CPL_DLL GTIFSetFromOGISDefn(GTIF*, const char*); -+char GTIF_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*); -+int GTIF_DLL GTIFSetFromOGISDefn(GTIF*, const char*); - - PDAL_C_END - diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 1a30d0d49c8db6..1a9f2d9fbebd7a 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -1,43 +1,27 @@ -diff --git a/cmake/geos.cmake b/cmake/geos.cmake -index 90b79d9..5942ee5 100644 ---- a/cmake/geos.cmake -+++ b/cmake/geos.cmake -@@ -1,8 +1,5 @@ - # - # GEOS (required) - # --find_package(GEOS QUIET 3.3) --set_package_properties(GEOS PROPERTIES TYPE REQUIRED -- PURPOSE "Provides general purpose geometry support") -- --include_directories("${GEOS_INCLUDE_DIR}") -+find_package(GEOS CONFIG REQUIRED) -+set(GEOS_LIBRARY GEOS::geos) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42cca1e..43b0ced 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -266,7 +265,7 @@ target_include_directories(${PDAL_BASE_LIB_NAME} target_link_libraries(${PDAL_BASE_LIB_NAME} - PUBLIC + PRIVATE ${CMAKE_THREAD_LIBS_INIT} - ${GDAL_LIBRARY} + ${GDAL_LIBRARIES} - ${GEOS_LIBRARY} ${GEOTIFF_LIBRARY} ${LASZIP_LIBRARY} + ${LIBXML2_LIBRARIES} diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in index a03ef14..9d073e6 100644 --- a/PDALConfig.cmake.in +++ b/PDALConfig.cmake.in -@@ -15,6 +15,10 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) - list(APPEND PDAL_LIBRARY_DIRS ${_foo}) - endforeach(_dir) +@@ -15,6 +15,9 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) + set_and_check(PDAL_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") + set_and_check(PDAL_LIBRARY_DIRS "@PACKAGE_LIB_INSTALL_DIR@") +include(CMakeFindDependencyMacro) +find_dependency(CURL CONFIG) -+find_dependency(GEOS CONFIG) +find_dependency(GeoTIFF CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") - if (WIN32) + # diff --git a/ports/pdal/fix-unix-compiler-options.patch b/ports/pdal/fix-unix-compiler-options.patch index d3889305a12ac0..79a379cb9cea96 100644 --- a/ports/pdal/fix-unix-compiler-options.patch +++ b/ports/pdal/fix-unix-compiler-options.patch @@ -11,21 +11,3 @@ index 679b4e7..08965d9 100644 # # This allows the rpath reference for the reexported library (above) to # be found. -diff --git a/cmake/unix_compiler_options.cmake b/cmake/unix_compiler_options.cmake -index 035a2b9..3e6058b 100644 ---- a/cmake/unix_compiler_options.cmake -+++ b/cmake/unix_compiler_options.cmake -@@ -24,7 +24,6 @@ function(PDAL_TARGET_COMPILE_SETTINGS target) - ${PDAL_CXX_STANDARD} - -Wextra - -Wpedantic -- -Werror - -Wall - -Wno-unused-parameter - -Wno-unused-variable -@@ -36,5 +35,4 @@ function(PDAL_TARGET_COMPILE_SETTINGS target) - -Wno-unknown-pragmas - -Wno-deprecated-declarations - ) -- target_include_directories(${target} SYSTEM PUBLIC /usr/local/include) - endfunction() diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 6c3e93b4664180..8896750f85a13b 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -1,29 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/PDAL - REF af6b7652117fbdb12c9f330570e8463e00058870 # 1.7.1 - SHA512 5e8a80de17f0c0e7fe6273d180d8736c08332e4a63a474cb052eb7eee3481c046bd587a13c4763dddb0f57e71a9eb673d3e68ce0d9107dd65c2050d6436bf6b0 + REF 2.3.0 + SHA512 898ea54c8c8e0a9bb8aed8d7f542da5a44b02c8656273783366d711b5b3f50b547438aa1cb4d41b490d187dae7bef20fe3b6c64dcb87c06e6f4cb91a8f79ac59 HEAD_REF master PATCHES - 0001-win32_compiler_options.cmake.patch 0002-no-source-dir-writes.patch 0003-fix-copy-vendor.patch fix-dependency.patch use-vcpkg-boost.patch fix-unix-compiler-options.patch - fix-CPL_DLL.patch - 0004-fix-const-overloaded.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") # Prefer pristine CMake find modules + wrappers and config files from vcpkg. -foreach(package IN ITEMS Curl GDAL GEOS GeoTIFF ICONV PostgreSQL) +foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL) file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" VCPKG_BUILD_STATIC_LIBS) +unset(ENV{OSGEO4W_HOME}) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -33,7 +32,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/pdal/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PDAL) vcpkg_copy_pdbs() # Install and cleanup executables @@ -49,8 +48,8 @@ vcpkg_copy_tools(TOOL_NAMES pdal AUTO_CLEAN) # Post-install clean-up file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/lib/pdal" - "${CURRENT_PACKAGES_DIR}/debug/lib/pdal" + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/csf" + "${CURRENT_PACKAGES_DIR}/include/pdal/filters/private/miniball" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/ports/pdal/use-vcpkg-boost.patch b/ports/pdal/use-vcpkg-boost.patch index 6f4fb89cd74285..5734b83be7a57c 100644 --- a/ports/pdal/use-vcpkg-boost.patch +++ b/ports/pdal/use-vcpkg-boost.patch @@ -9,60 +9,63 @@ index 2adc310..679b4e7 100644 -add_subdirectory(vendor/pdalboost) add_subdirectory(vendor/arbiter) add_subdirectory(vendor/kazhdan) - if (NOT PDAL_HAVE_JSONCPP) + add_subdirectory(pdal/util) diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in index bf6137e..890a8ac 100644 --- a/PDALConfig.cmake.in +++ b/PDALConfig.cmake.in @@ -16,6 +16,7 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) - endforeach(_dir) + set_and_check(PDAL_LIBRARY_DIRS "@PACKAGE_LIB_INSTALL_DIR@") include(CMakeFindDependencyMacro) -+find_dependency(Boost COMPONENTS filesystem) ++find_dependency(Boost COMPONENTS filesystem system) find_dependency(CURL CONFIG) - find_dependency(GEOS CONFIG) find_dependency(GeoTIFF CONFIG) + include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt index 19a2dd1..d498080 100644 --- a/pdal/util/CMakeLists.txt +++ b/pdal/util/CMakeLists.txt @@ -8,6 +8,9 @@ endif() + set(BACKTRACE_SOURCE BacktraceNone.cpp) + endif() - include(${PDAL_CMAKE_DIR}/execinfo.cmake) - -+find_package(Boost COMPONENTS filesystem REQUIRED) -+set(PDAL_BOOST_LIB_NAME Boost::filesystem) ++find_package(Boost COMPONENTS filesystem system REQUIRED) ++set(PDAL_BOOST_LIB_NAME Boost::filesystem Boost::system) + set(PDAL_UTIL_SOURCES "${PDAL_UTIL_DIR}/Bounds.cpp" "${PDAL_UTIL_DIR}/Charbuf.cpp" -@@ -16,14 +19,12 @@ set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Utils.cpp" - ) +@@ -16,16 +19,14 @@ set(PDAL_UTIL_SOURCES + "${PDAL_UTIL_DIR}/private/${BACKTRACE_SOURCE}" + ) -PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES}) +PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} ${PDAL_UTIL_SOURCES}) target_link_libraries(${PDAL_UTIL_LIB_NAME} PRIVATE - ${EXECINFO_LIBRARY} + ${BACKTRACE_LIBRARIES} ${PDAL_BOOST_LIB_NAME} + ${CMAKE_DL_LIBS} + ${CMAKE_THREAD_LIBS_INIT} ) -target_include_directories(${PDAL_UTIL_LIB_NAME} PRIVATE - ${PDAL_VENDOR_DIR}/pdalboost) - if (UNIX AND NOT APPLE) - target_link_libraries(${PDAL_UTIL_LIB_NAME} + set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES + VERSION "${PDAL_BUILD_VERSION}" diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp index 7679f22..b18b674 100644 --- a/pdal/util/FileUtils.cpp +++ b/pdal/util/FileUtils.cpp -@@ -74,6 +74,11 @@ std::string addTrailingSlash(std::string path) +@@ -74,6 +74,12 @@ std::string addTrailingSlash(std::string path) } // unnamed namespace +namespace pdalboost +{ + namespace filesystem = boost::filesystem; ++ namespace system = boost::system; +} + namespace FileUtils diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index f5897aee31efb2..dcc4db4cb85aea 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pdal", - "version": "1.7.1", - "port-version": 13, + "version": "2.3.0", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "dependencies": [ "boost-filesystem", From 93d9bcf4fe432ee9290f61ae6b35f343de18f1cd Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 11 Nov 2021 08:30:47 +0100 Subject: [PATCH 14/33] PDAL supports only dynamic linkage --- ports/pdal/0003-fix-copy-vendor.patch | 98 ++++++--------------------- ports/pdal/fix-dependency.patch | 14 ---- ports/pdal/portfile.cmake | 5 +- ports/pdal/use-vcpkg-boost.patch | 23 +------ ports/pdal/vcpkg.json | 2 + 5 files changed, 25 insertions(+), 117 deletions(-) diff --git a/ports/pdal/0003-fix-copy-vendor.patch b/ports/pdal/0003-fix-copy-vendor.patch index 995de044518dc8..092c4651fcf7e6 100644 --- a/ports/pdal/0003-fix-copy-vendor.patch +++ b/ports/pdal/0003-fix-copy-vendor.patch @@ -1,78 +1,20 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43e446a..c4c7d6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -339,6 +339,30 @@ install(DIRECTORY ${PDAL_FILTERS_DIR} - install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} - DESTINATION include/pdal - ) -+# Install vendor headers -+install(DIRECTORY ${PDAL_VENDOR_ARBITER_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_JSONCPP_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_KAZHDAN_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "private" EXCLUDE -+) -+ -+install(DIRECTORY ${PDAL_VENDOR_NANOFLANN_DIR} -+ DESTINATION include/pdal/vendor -+ FILES_MATCHING PATTERN "*.hpp" -+ PATTERN "private" EXCLUDE -+) - - # - # 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 -+++ b/cmake/directories.cmake -@@ -11,4 +11,7 @@ set(PDAL_KERNELS_DIR ${ROOT_DIR}/kernels) - set(PDAL_FILTERS_DIR ${ROOT_DIR}/filters) - set(PDAL_IO_DIR ${ROOT_DIR}/io) - set(PDAL_VENDOR_DIR ${ROOT_DIR}/vendor) -- -+set(PDAL_VENDOR_ARBITER_DIR ${PDAL_VENDOR_DIR}/arbiter) -+set(PDAL_VENDOR_JSONCPP_DIR ${PDAL_VENDOR_DIR}/jsoncpp) -+set(PDAL_VENDOR_KAZHDAN_DIR ${PDAL_VENDOR_DIR}/kazhdan) -+set(PDAL_VENDOR_NANOFLANN_DIR ${PDAL_VENDOR_DIR}/nanoflann) - -\ No newline at end of file -diff --git a/cmake/macros.cmake b/cmake/macros.cmake -index 3091544..4c65311 100644 ---- a/cmake/macros.cmake -+++ b/cmake/macros.cmake -@@ -77,12 +77,13 @@ macro(PDAL_ADD_FREE_LIBRARY _name _library_type) - # Don't install static libraries - they're already built into libpdalXXX - if (NOT ${_library_type} STREQUAL "STATIC") - target_compile_definitions(${_name} PRIVATE PDAL_DLL_EXPORT) -+ endif() -+ if (1) - install(TARGETS ${_name} - EXPORT PDALTargets - RUNTIME DESTINATION ${PDAL_BIN_INSTALL_DIR} - LIBRARY DESTINATION ${PDAL_LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${PDAL_LIB_INSTALL_DIR}) -- else() - set_target_properties(${_name} PROPERTIES - POSITION_INDEPENDENT_CODE TRUE) - endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e918a3e..a3f9a03 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -375,6 +375,15 @@ install(DIRECTORY ${PDAL_FILTERS_DIR} + install(FILES ${DIMENSION_OUTFILE} ${pdal_features_hpp} + DESTINATION include/pdal + ) ++# Instaqll vendor headers ++install(DIRECTORY ++ ${PDAL_VENDOR_DIR}/arbiter ++ ${PDAL_VENDOR_DIR}/kazhdan ++ ${PDAL_VENDOR_DIR}/nanoflann ++ DESTINATION include/pdal/vendor ++ FILES_MATCHING PATTERN "*.hpp" PATTERN PATTERN "*.h" ++ PATTERN "private" EXCLUDE ++) + + # + # CPACK diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index 1a9f2d9fbebd7a..a40403b61c76d7 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -11,17 +11,3 @@ index 42cca1e..43b0ced 100644 ${GEOTIFF_LIBRARY} ${LASZIP_LIBRARY} ${LIBXML2_LIBRARIES} -diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in -index a03ef14..9d073e6 100644 ---- a/PDALConfig.cmake.in -+++ b/PDALConfig.cmake.in -@@ -15,6 +15,9 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) - set_and_check(PDAL_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") - set_and_check(PDAL_LIBRARY_DIRS "@PACKAGE_LIB_INSTALL_DIR@") - -+include(CMakeFindDependencyMacro) -+find_dependency(CURL CONFIG) -+find_dependency(GeoTIFF CONFIG) - include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") - - # diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 8896750f85a13b..41fb9aea1562d1 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/PDAL @@ -19,14 +21,11 @@ foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL) file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" VCPKG_BUILD_STATIC_LIBS) - unset(ENV{OSGEO4W_HOME}) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPDAL_BUILD_STATIC:BOOL=${VCPKG_BUILD_STATIC_LIBS} -DWITH_TESTS:BOOL=OFF -DWITH_COMPLETION:BOOL=OFF ) diff --git a/ports/pdal/use-vcpkg-boost.patch b/ports/pdal/use-vcpkg-boost.patch index 5734b83be7a57c..c0d06de17effee 100644 --- a/ports/pdal/use-vcpkg-boost.patch +++ b/ports/pdal/use-vcpkg-boost.patch @@ -10,18 +10,6 @@ index 2adc310..679b4e7 100644 add_subdirectory(vendor/arbiter) add_subdirectory(vendor/kazhdan) add_subdirectory(pdal/util) -diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in -index bf6137e..890a8ac 100644 ---- a/PDALConfig.cmake.in -+++ b/PDALConfig.cmake.in -@@ -16,6 +16,7 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@) - set_and_check(PDAL_LIBRARY_DIRS "@PACKAGE_LIB_INSTALL_DIR@") - - include(CMakeFindDependencyMacro) -+find_dependency(Boost COMPONENTS filesystem system) - find_dependency(CURL CONFIG) - find_dependency(GeoTIFF CONFIG) - include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake") diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt index 19a2dd1..d498080 100644 --- a/pdal/util/CMakeLists.txt @@ -36,16 +24,7 @@ index 19a2dd1..d498080 100644 set(PDAL_UTIL_SOURCES "${PDAL_UTIL_DIR}/Bounds.cpp" "${PDAL_UTIL_DIR}/Charbuf.cpp" -@@ -16,16 +19,14 @@ set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/private/${BACKTRACE_SOURCE}" - ) - --PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} SHARED ${PDAL_UTIL_SOURCES}) -+PDAL_ADD_FREE_LIBRARY(${PDAL_UTIL_LIB_NAME} ${PDAL_UTIL_SOURCES}) - target_link_libraries(${PDAL_UTIL_LIB_NAME} - PRIVATE - ${BACKTRACE_LIBRARIES} - ${PDAL_BOOST_LIB_NAME} +@@ -24,8 +27,6 @@ set(PDAL_UTIL_SOURCES ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index dcc4db4cb85aea..07b5d2b77b8568 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -2,6 +2,8 @@ "name": "pdal", "version": "2.3.0", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", + "homepage": "https://pdal.io/", + "supports": "!windows , !staticcrt", "dependencies": [ "boost-filesystem", "boost-system", From cdc870a2ea886369e67302c7a31295108fdbaccd Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 10 Nov 2021 09:20:39 +0100 Subject: [PATCH 15/33] Normalize find_library --- ports/pdal/fix-find-library-suffix.patch | 16 ++++++++++++++++ ports/pdal/portfile.cmake | 1 + 2 files changed, 17 insertions(+) create mode 100644 ports/pdal/fix-find-library-suffix.patch diff --git a/ports/pdal/fix-find-library-suffix.patch b/ports/pdal/fix-find-library-suffix.patch new file mode 100644 index 00000000000000..53eefb68d12f6e --- /dev/null +++ b/ports/pdal/fix-find-library-suffix.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/libraries.cmake b/cmake/libraries.cmake +index dae98ea..edab055 100644 +--- a/cmake/libraries.cmake ++++ b/cmake/libraries.cmake +@@ -3,11 +3,7 @@ + option(PDAL_BUILD_STATIC "Build PDAL as a static library" OFF) + if (PDAL_BUILD_STATIC) + set(PDAL_LIB_TYPE "STATIC") +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) + else () + set(PDAL_LIB_TYPE "SHARED") +- if (WIN32) +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) +- endif() + endif() + mark_as_advanced(PDAL_BUILD_STATIC) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 41fb9aea1562d1..722fd143da650a 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( fix-dependency.patch use-vcpkg-boost.patch fix-unix-compiler-options.patch + fix-find-library-suffix.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") From d424597a7caf833ef0a11cd918d90e8fd2e1fa3c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 11 Nov 2021 08:30:47 +0100 Subject: [PATCH 16/33] Dependencies, features and plugins --- ports/pdal/fix-dependency.patch | 21 ++++++++ ports/pdal/portfile.cmake | 25 ++++++++- ports/pdal/vcpkg.json | 95 +++++++++++++++++++++++++++++++-- 3 files changed, 135 insertions(+), 6 deletions(-) diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index a40403b61c76d7..8e794946436c81 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -11,3 +11,24 @@ index 42cca1e..43b0ced 100644 ${GEOTIFF_LIBRARY} ${LASZIP_LIBRARY} ${LIBXML2_LIBRARIES} +diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake +index bfaa5b2..e73ec9e 100644 +--- a/cmake/zstd.cmake ++++ b/cmake/zstd.cmake +@@ -4,7 +4,15 @@ + option(WITH_ZSTD + "Build support for compression/decompression with Zstd." TRUE) + if (WITH_ZSTD) +- find_package(ZSTD QUIET) ++ find_package(zstd CONFIG REQUIRED) ++ set(ZSTD_FOUND TRUE) ++ set(ZSTD_INCLUDE_DIRS "") ++ if(TARGET zstd::libzstd_static) ++ set(ZSTD_LIBRARIES zstd::libzstd_static) ++ set(ZSTD_STATIC_LIB zstd::libzstd_static) ++ else() ++ set(ZSTD_LIBRARIES zstd::libzstd_shared) ++ endif() + set_package_properties(ZSTD PROPERTIES TYPE + PURPOSE "General compression support") + if (ZSTD_FOUND) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 722fd143da650a..074b8cb35709c3 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -18,17 +18,40 @@ vcpkg_from_github( file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") # Prefer pristine CMake find modules + wrappers and config files from vcpkg. -foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL) +foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL ZSTD) file(REMOVE "${SOURCE_PATH}/cmake/modules/Find${package}.cmake") endforeach() unset(ENV{OSGEO4W_HOME}) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + draco BUILD_PLUGIN_DRACO + e57 BUILD_PLUGIN_E57 + hdf5 BUILD_PLUGIN_HDF + i3s BUILD_PLUGIN_I3S + laszip WITH_LASZIP + lzma WITH_LZMA + pgpointcloud BUILD_PLUGIN_PGPOINTCLOUD + zstd WITH_ZSTD +) +if(BUILD_PLUGIN_DRACO) + vcpkg_find_acquire_program(PKGCONFIG) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + -DPOSTGRESQL_LIBRARIES=PostgreSQL::PostgreSQL -DWITH_TESTS:BOOL=OFF -DWITH_COMPLETION:BOOL=OFF + -DWITH_LAZPERF:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Libexecinfo:BOOL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libunwind:BOOL=ON + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + POSTGRESQL_LIBRARIES ) vcpkg_cmake_install() diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 07b5d2b77b8568..8bb647fa7db418 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -7,11 +7,16 @@ "dependencies": [ "boost-filesystem", "boost-system", - "gdal", - "geos", - "jsoncpp", - "laszip", + { + "name": "curl", + "default-features": false + }, + { + "name": "gdal", + "default-features": false + }, "libgeotiff", + "libxml2", { "name": "vcpkg-cmake", "host": true @@ -20,5 +25,85 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "laszip", + "supported-plugins" + ], + "features": { + "draco": { + "description": "Build the Draco plugin", + "dependencies": [ + "draco" + ] + }, + "e57": { + "description": "Build the E57 plugin", + "dependencies": [ + "xerces-c" + ] + }, + "hdf": { + "description": "Build the HDF plugin", + "dependencies": [ + { + "name": "hdf5", + "default-features": false + } + ] + }, + "i3s": { + "description": "Build the SLPK/I3S plugins", + "dependencies": [ + "zlib" + ] + }, + "laszip": { + "description": "LASzip support", + "dependencies": [ + "laszip" + ] + }, + "liblzma": { + "description": "Support for compression/decompression with LZMA", + "dependencies": [ + "liblzma" + ] + }, + "pgpointcloud": { + "description": "Build the PgPointCloud plugin", + "dependencies": [ + "libpq" + ] + }, + "supported-plugins": { + "description": "Default set of plugins, dependent on platform", + "dependencies": [ + { + "name": "pdal", + "default-features": false, + "features": [ + "draco", + "e57", + "i3s" + ] + }, + { + "name": "pdal", + "default-features": false, + "features": [ + "hdf", + "pgpointcloud" + ], + "platform": "!uwp" + } + ] + }, + "zstd": { + "description": "Support for ZSTD compression/decompression", + "dependencies": [ + "zstd" + ] + } + } } From 0aa95e26d5b5872e947fdc46094014975a687d12 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Dec 2021 11:00:09 +0100 Subject: [PATCH 17/33] Update pdalboost fixup --- ports/pdal/portfile.cmake | 1 + ports/pdal/use-vcpkg-boost.patch | 46 +++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 074b8cb35709c3..41758e769fc83d 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") +file(REMOVE_RECURSE "${SOURCE_PATH}/vendor/pdalboost/boost" "${SOURCE_PATH}/vendor/pdalboost/libs") # Prefer pristine CMake find modules + wrappers and config files from vcpkg. foreach(package IN ITEMS Curl GeoTIFF ICONV PostgreSQL ZSTD) diff --git a/ports/pdal/use-vcpkg-boost.patch b/ports/pdal/use-vcpkg-boost.patch index c0d06de17effee..d07bf6eea54ccc 100644 --- a/ports/pdal/use-vcpkg-boost.patch +++ b/ports/pdal/use-vcpkg-boost.patch @@ -1,8 +1,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2adc310..679b4e7 100644 +index 83a396b..7ebcc3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -174,7 +174,6 @@ if (WITH_TESTS) +@@ -67,7 +67,8 @@ else() + endif() + set(PDAL_LIB_NAME pdalcpp) + set(PDAL_UTIL_LIB_NAME pdal_util) +-set(PDAL_BOOST_LIB_NAME pdal_boost) ++find_package(Boost COMPONENTS filesystem system REQUIRED) ++set(PDAL_BOOST_LIB_NAME Boost::filesystem Boost::system) + set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan) + set(PDAL_TEST_SUPPORT_OBJS pdal_test_support) + +@@ -179,13 +180,11 @@ endif() + + add_subdirectory(plugins) + +-#include_directories(vendor/pdalboost) + if (WITH_TESTS) + include (${PDAL_CMAKE_DIR}/gtest.cmake) add_subdirectory(test) endif() add_subdirectory(dimbuilder) @@ -10,21 +26,19 @@ index 2adc310..679b4e7 100644 add_subdirectory(vendor/arbiter) add_subdirectory(vendor/kazhdan) add_subdirectory(pdal/util) +@@ -269,7 +268,6 @@ target_include_directories(${PDAL_BASE_LIB_NAME} + ${PROJECT_BINARY_DIR}/include + ${PDAL_VENDOR_DIR} + ${PDAL_VENDOR_DIR}/eigen +- ${PDAL_VENDOR_DIR}/pdalboost + ${LIBXML2_INCLUDE_DIR} + ${ZSTD_INCLUDE_DIRS} + ${NLOHMANN_INCLUDE_DIR} diff --git a/pdal/util/CMakeLists.txt b/pdal/util/CMakeLists.txt -index 19a2dd1..d498080 100644 +index 6b3e889..8a42122 100644 --- a/pdal/util/CMakeLists.txt +++ b/pdal/util/CMakeLists.txt -@@ -8,6 +8,9 @@ endif() - set(BACKTRACE_SOURCE BacktraceNone.cpp) - endif() - -+find_package(Boost COMPONENTS filesystem system REQUIRED) -+set(PDAL_BOOST_LIB_NAME Boost::filesystem Boost::system) -+ - set(PDAL_UTIL_SOURCES - "${PDAL_UTIL_DIR}/Bounds.cpp" - "${PDAL_UTIL_DIR}/Charbuf.cpp" -@@ -24,8 +27,6 @@ set(PDAL_UTIL_SOURCES +@@ -40,8 +40,6 @@ target_link_libraries(${PDAL_UTIL_LIB_NAME} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ) @@ -34,10 +48,10 @@ index 19a2dd1..d498080 100644 set_target_properties(${PDAL_UTIL_LIB_NAME} PROPERTIES VERSION "${PDAL_BUILD_VERSION}" diff --git a/pdal/util/FileUtils.cpp b/pdal/util/FileUtils.cpp -index 7679f22..b18b674 100644 +index ee47b55..4a57268 100644 --- a/pdal/util/FileUtils.cpp +++ b/pdal/util/FileUtils.cpp -@@ -74,6 +74,12 @@ std::string addTrailingSlash(std::string path) +@@ -98,6 +98,12 @@ inline std::string const& toNative(std::string const& in) { return in; } } // unnamed namespace From edc4501a278cd62d7e72edcdcebd474c90cf7aee Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 12 Dec 2021 12:57:22 +0100 Subject: [PATCH 18/33] Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. --- ports/pdal/no-pkgconfig-requires.patch | 12 ++++++++++++ ports/pdal/portfile.cmake | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 ports/pdal/no-pkgconfig-requires.patch diff --git a/ports/pdal/no-pkgconfig-requires.patch b/ports/pdal/no-pkgconfig-requires.patch new file mode 100644 index 00000000000000..1f0841e2c73a52 --- /dev/null +++ b/ports/pdal/no-pkgconfig-requires.patch @@ -0,0 +1,12 @@ +diff --git a/apps/pdal.pc.in b/apps/pdal.pc.in +index 6885221..cd2136c 100644 +--- a/apps/pdal.pc.in ++++ b/apps/pdal.pc.in +@@ -5,7 +5,6 @@ includedir=@CMAKE_INSTALL_PREFIX@/include + + Name: PDAL + Description: Point Data Abstraction Library +-Requires: @PKGCONFIG_LIBRARY_DEFINITIONS@ + Version: @PDAL_VERSION@ + Libs: -L${libdir} -l@PDAL_LIB_NAME@ + Cflags: -I${includedir}/pdal @PDAL_CONFIG_DEFINITIONS@ diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 41758e769fc83d..d61c6f8cfbca70 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( use-vcpkg-boost.patch fix-unix-compiler-options.patch fix-find-library-suffix.patch + no-pkgconfig-requires.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") @@ -57,6 +58,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PDAL) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() # Install and cleanup executables From 765e105a151d772b684680d367586d4634f37984 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 12 Dec 2021 13:13:04 +0100 Subject: [PATCH 19/33] Override absolute plugin path --- ports/pdal/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index d61c6f8cfbca70..281b88521b45a3 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -44,6 +44,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DPDAL_PLUGIN_INSTALL_PATH=. "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DPOSTGRESQL_LIBRARIES=PostgreSQL::PostgreSQL -DWITH_TESTS:BOOL=OFF From 93b6b49d4567a9fed89389e96e42310dad831335 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Dec 2021 14:02:51 +0100 Subject: [PATCH 20/33] Don't set RPATH --- ports/pdal/no-rpath.patch | 12 ++++++++++++ ports/pdal/portfile.cmake | 1 + 2 files changed, 13 insertions(+) create mode 100644 ports/pdal/no-rpath.patch diff --git a/ports/pdal/no-rpath.patch b/ports/pdal/no-rpath.patch new file mode 100644 index 00000000000000..ab2c555c9bf319 --- /dev/null +++ b/ports/pdal/no-rpath.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/rpath.cmake b/cmake/rpath.cmake +index ba486b7..4323a77 100644 +--- a/cmake/rpath.cmake ++++ b/cmake/rpath.cmake +@@ -1,6 +1,7 @@ + # + # Set options and variable related to OSX rpath. + # ++return() + + # per http://www.cmake.org/Wiki/CMake_RPATH_handling + SET(CMAKE_SKIP_BUILD_RPATH FALSE) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 281b88521b45a3..f738d45da8d19d 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( fix-unix-compiler-options.patch fix-find-library-suffix.patch no-pkgconfig-requires.patch + no-rpath.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") From e46d8f65ef41dbab06e5f23ea59f25d6a8129f4d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Dec 2021 14:31:22 +0100 Subject: [PATCH 21/33] Add usage --- ports/pdal/portfile.cmake | 1 + ports/pdal/usage | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 ports/pdal/usage diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index f738d45da8d19d..dda2aead16c1bb 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -82,4 +82,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pdal/usage b/ports/pdal/usage new file mode 100644 index 00000000000000..eaf37886430891 --- /dev/null +++ b/ports/pdal/usage @@ -0,0 +1,9 @@ +The package pdal provides CMake variables: + + find_package(PDAL CONFIG REQUIRED) + target_include_directories(${PDAL_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${PDAL_LIBRARIES}) + +If necessary, override the default plugin search path by setting the +environment variable PDAL_DRIVER_PATH to a list of directories that +pdal should search for plugins. From e98f80650570b4ebd203ff0db9d04309fac3e33a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 12 Dec 2021 12:26:58 +0100 Subject: [PATCH 22/33] [pdal-c] Update portfile --- ports/pdal-c/portfile.cmake | 26 ++++++++++++++------------ ports/pdal-c/vcpkg.json | 8 ++++++-- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index 3e1b8c1a93b405..99d43e4e652573 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -7,26 +7,28 @@ vcpkg_from_github( SHA512 6a5f4cb3d36b419f3cd195028c3e6dc17abf3cdb7495aa3df638bc1f842ba98243c73e051e9cfcd3afe22787309cb871374b152ded92e6e06f404cd7b1ae50bf HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/fix-docs-version.patch - ${CMAKE_CURRENT_LIST_DIR}/preserve-install-dir.patch - ${CMAKE_CURRENT_LIST_DIR}/remove-tests.patch + fix-docs-version.patch + preserve-install-dir.patch + remove-tests.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_TARGET_IS_WINDOWS) + string(APPEND VCPKG_C_FLAGS " -DNOMINMAX") + string(APPEND VCPKG_CXX_FLAGS " -DNOMINMAX") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove headers from debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Install copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdal-c - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json index c0629c9909de99..41e3ec65f54e3f 100644 --- a/ports/pdal-c/vcpkg.json +++ b/ports/pdal-c/vcpkg.json @@ -1,9 +1,13 @@ { "name": "pdal-c", "version-string": "1.8", - "port-version": 3, + "port-version": 4, "description": "C API for the Point Data Abstraction Library (PDAL)", "dependencies": [ - "pdal" + "pdal", + { + "name": "vcpkg-cmake", + "host": true + } ] } From 53d0cf9ec3ddbda6a9d45c40b02cbff058bda762 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Dec 2021 10:53:57 +0100 Subject: [PATCH 23/33] [pdal-c] Don't enforce pdal features --- ports/pdal-c/vcpkg.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json index 41e3ec65f54e3f..5afd6d06efbea9 100644 --- a/ports/pdal-c/vcpkg.json +++ b/ports/pdal-c/vcpkg.json @@ -4,7 +4,10 @@ "port-version": 4, "description": "C API for the Point Data Abstraction Library (PDAL)", "dependencies": [ - "pdal", + { + "name": "pdal", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true From 33177b906cce3cb403d79925c33098cf4afde04e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Dec 2021 15:30:37 +0100 Subject: [PATCH 24/33] [pdal-c] Update to v2.1.0 --- ports/pdal-c/fix-docs-version.patch | 14 -------------- ports/pdal-c/portfile.cmake | 12 +++++------- ports/pdal-c/preserve-install-dir.patch | 13 ------------- ports/pdal-c/remove-tests.patch | 12 ------------ ports/pdal-c/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 2 -- 6 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 ports/pdal-c/fix-docs-version.patch delete mode 100644 ports/pdal-c/preserve-install-dir.patch delete mode 100644 ports/pdal-c/remove-tests.patch diff --git a/ports/pdal-c/fix-docs-version.patch b/ports/pdal-c/fix-docs-version.patch deleted file mode 100644 index d44b50b6141b8b..00000000000000 --- a/ports/pdal-c/fix-docs-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..c8a325a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -23,7 +23,8 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "CMake RelWithDebInfo suffix") - set(PDALC_ENABLE_CODE_COVERAGE ON CACHE BOOL "Enable code coverage calculation") - set(PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE "131072" CACHE STRING "GCC garbage collection minimum heap size") - --include(ObtainProjectVersion) -+set(${PROJECT_NAME}_VERSION "1.8") -+set(BUILD_ID "vcpkg build") - include_directories("${CMAKE_SOURCE_DIR}/source") - - if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index 99d43e4e652573..789844790c0660 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -3,13 +3,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/CAPI - REF 1.8 - SHA512 6a5f4cb3d36b419f3cd195028c3e6dc17abf3cdb7495aa3df638bc1f842ba98243c73e051e9cfcd3afe22787309cb871374b152ded92e6e06f404cd7b1ae50bf + REF v2.1.0 + SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd HEAD_REF master - PATCHES - fix-docs-version.patch - preserve-install-dir.patch - remove-tests.patch ) if(VCPKG_TARGET_IS_WINDOWS) @@ -21,7 +17,9 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=ON + -DPDALC_ENABLE_DOCS:BOOL=OFF + -DPDALC_ENABLE_TESTS:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON ) vcpkg_cmake_install() diff --git a/ports/pdal-c/preserve-install-dir.patch b/ports/pdal-c/preserve-install-dir.patch deleted file mode 100644 index 87377ab2f5500d..00000000000000 --- a/ports/pdal-c/preserve-install-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..075c86c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,8 +13,6 @@ set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - --# Install to the build directory --set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}" CACHE STRING "CMake install prefix" FORCE) - - # Use "d" suffix for debug builds - # Do not use a suffix for RelWithDebInfo diff --git a/ports/pdal-c/remove-tests.patch b/ports/pdal-c/remove-tests.patch deleted file mode 100644 index c50914e576e2cd..00000000000000 --- a/ports/pdal-c/remove-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fbc4a4..e31e552 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -44,7 +44,3 @@ endif() - - add_subdirectory("source/pdal") - add_subdirectory("doc") -- --include(CTest) --add_subdirectory("tests/data") --add_subdirectory("tests/pdal") diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json index 5afd6d06efbea9..4fe6a329a1321d 100644 --- a/ports/pdal-c/vcpkg.json +++ b/ports/pdal-c/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pdal-c", - "version-string": "1.8", - "port-version": 4, + "version-string": "2.1", "description": "C API for the Point Data Abstraction Library (PDAL)", + "homepage": "https://github.com/PDAL/CAPI#readme", + "supports": "!staticcrt", "dependencies": [ { "name": "pdal", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ee3ed3561b50c0..c9c40a514bd0b3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1140,8 +1140,6 @@ paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail pango:x64-windows-static-md=fail pangomm:arm64-windows=fail -pdal-c:x64-windows-static=fail -pdal-c:x64-windows-static-md=fail pdcurses:arm-uwp=fail pdcurses:x64-linux=fail pdcurses:x64-osx=fail From 513cfdcab30a72215b1bce07d778d933ce38e97a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 15 Dec 2021 07:14:44 +0100 Subject: [PATCH 25/33] Update versions --- versions/baseline.json | 8 ++++---- versions/p-/pdal-c.json | 5 +++++ versions/p-/pdal.json | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 1ff8371dacf831..b883b2dcbdbcc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5137,12 +5137,12 @@ "port-version": 0 }, "pdal": { - "baseline": "1.7.1", - "port-version": 13 + "baseline": "2.3.0", + "port-version": 0 }, "pdal-c": { - "baseline": "1.8", - "port-version": 3 + "baseline": "2.1", + "port-version": 0 }, "pdcurses": { "baseline": "3.9", diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index b989fb33fdff02..c6558878cd2080 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "137db7db8fe4292b852b802bcd3d9f6741aa8014", + "version-string": "2.1", + "port-version": 0 + }, { "git-tree": "9319bb871924d143523c4e79ecc45bc9260360b5", "version-string": "1.8", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 65cfa4505309ab..dce929f50f53f4 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8a87a597c7f27d86d36ea806a41f9a97b49f214", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "11280c0564220eb3e82eae1c596843daf5b79294", "version": "1.7.1", From 8a2034263b052a14f7d194a37e18318d2ad17362 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 15 Dec 2021 19:30:22 +0100 Subject: [PATCH 26/33] Convert tabs --- ports/pdal-c/portfile.cmake | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index 789844790c0660..6dcb0f5f3af76f 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO PDAL/CAPI - REF v2.1.0 - SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO PDAL/CAPI + REF v2.1.0 + SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd + HEAD_REF master ) if(VCPKG_TARGET_IS_WINDOWS) @@ -14,12 +14,12 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF - -DPDALC_ENABLE_DOCS:BOOL=OFF - -DPDALC_ENABLE_TESTS:BOOL=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF + -DPDALC_ENABLE_DOCS:BOOL=OFF + -DPDALC_ENABLE_TESTS:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=ON ) vcpkg_cmake_install() From c7ffe64ebb6dd5c662ff61e081bf18a76416fdf2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 15 Dec 2021 19:30:52 +0100 Subject: [PATCH 27/33] Update versions --- versions/p-/pdal-c.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index c6558878cd2080..06ca061cc8605f 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "137db7db8fe4292b852b802bcd3d9f6741aa8014", + "git-tree": "1894e053f2db9ba228bea1e883f0a97056253ed0", "version-string": "2.1", "port-version": 0 }, From 4a8e8fc102481cb0e76392500289bed8dea61cd8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 16 Dec 2021 10:12:30 +0100 Subject: [PATCH 28/33] Patch NOMINMAX definition --- ports/pdal-c/add-compile-definitions.patch | 10 ++++++++++ ports/pdal-c/portfile.cmake | 7 ++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 ports/pdal-c/add-compile-definitions.patch diff --git a/ports/pdal-c/add-compile-definitions.patch b/ports/pdal-c/add-compile-definitions.patch new file mode 100644 index 00000000000000..a7ea99762910d6 --- /dev/null +++ b/ports/pdal-c/add-compile-definitions.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c02626b..62d97c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,2 +5,5 @@ cmake_minimum_required(VERSION 3.9) + project(pdal-c C CXX) ++if(WIN32) ++ add_compile_definitions(NOMINMAX) ++endif() + diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index 6dcb0f5f3af76f..aaa9677725a90f 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -6,13 +6,10 @@ vcpkg_from_github( REF v2.1.0 SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd HEAD_REF master + PATCHES + add-compile-definitions.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - string(APPEND VCPKG_C_FLAGS " -DNOMINMAX") - string(APPEND VCPKG_CXX_FLAGS " -DNOMINMAX") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS From c28042bfc7cbeb3375b2778ca45249ec44103126 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 16 Dec 2021 10:13:02 +0100 Subject: [PATCH 29/33] Update versions --- versions/p-/pdal-c.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index 06ca061cc8605f..19257dea05bad7 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1894e053f2db9ba228bea1e883f0a97056253ed0", + "git-tree": "9dbf7f13e9aaf40af9190d6de0c63669ef539015", "version-string": "2.1", "port-version": 0 }, From a8ae0ce14477392d9f137ade597916f477f6f197 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 9 Jan 2022 15:38:21 +0100 Subject: [PATCH 30/33] Use project include instead of patch --- ports/pdal-c/add-compile-definitions.patch | 10 ---------- ports/pdal-c/cmake-project-include.cmake | 3 +++ ports/pdal-c/portfile.cmake | 3 +-- 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 ports/pdal-c/add-compile-definitions.patch create mode 100644 ports/pdal-c/cmake-project-include.cmake diff --git a/ports/pdal-c/add-compile-definitions.patch b/ports/pdal-c/add-compile-definitions.patch deleted file mode 100644 index a7ea99762910d6..00000000000000 --- a/ports/pdal-c/add-compile-definitions.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c02626b..62d97c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,2 +5,5 @@ cmake_minimum_required(VERSION 3.9) - project(pdal-c C CXX) -+if(WIN32) -+ add_compile_definitions(NOMINMAX) -+endif() - diff --git a/ports/pdal-c/cmake-project-include.cmake b/ports/pdal-c/cmake-project-include.cmake new file mode 100644 index 00000000000000..39f3cca6d23982 --- /dev/null +++ b/ports/pdal-c/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(WIN32) + add_compile_definitions(NOMINMAX) +endif() diff --git a/ports/pdal-c/portfile.cmake b/ports/pdal-c/portfile.cmake index aaa9677725a90f..bb06b4d04cfeca 100644 --- a/ports/pdal-c/portfile.cmake +++ b/ports/pdal-c/portfile.cmake @@ -6,13 +6,12 @@ vcpkg_from_github( REF v2.1.0 SHA512 07c671f83af93594d7792d770890205aad1a44803696f9567aa25f69a277fa5c3f4e9f9f5f0210ebd59f5cf75aff1f80ce532bd7bbd536a699724ceb6e3277fd HEAD_REF master - PATCHES - add-compile-definitions.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DPDALC_ENABLE_CODE_COVERAGE:BOOL=OFF -DPDALC_ENABLE_DOCS:BOOL=OFF -DPDALC_ENABLE_TESTS:BOOL=OFF From 307352a99bb6d9e6af076218ed618779df427c0d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 9 Jan 2022 15:38:51 +0100 Subject: [PATCH 31/33] Update versions --- versions/p-/pdal-c.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index 19257dea05bad7..e7a2da8d348bf3 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9dbf7f13e9aaf40af9190d6de0c63669ef539015", + "git-tree": "fa6ad95c56f1e27fb02f7fe229e84378dd521011", "version-string": "2.1", "port-version": 0 }, From 67afbe0e7ad7cf79f4416acef6e31aa574c2c5a5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 11 Jan 2022 08:08:15 +0100 Subject: [PATCH 32/33] Update 'supports' field --- ports/pdal-c/vcpkg.json | 2 +- ports/pdal/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json index 4fe6a329a1321d..f02d1afdfc5177 100644 --- a/ports/pdal-c/vcpkg.json +++ b/ports/pdal-c/vcpkg.json @@ -3,7 +3,7 @@ "version-string": "2.1", "description": "C API for the Point Data Abstraction Library (PDAL)", "homepage": "https://github.com/PDAL/CAPI#readme", - "supports": "!staticcrt", + "supports": "!(windows & staticcrt)", "dependencies": [ { "name": "pdal", diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 8bb647fa7db418..b4f2a01dde978d 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -3,7 +3,7 @@ "version": "2.3.0", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", - "supports": "!windows , !staticcrt", + "supports": "!(windows & staticcrt)", "dependencies": [ "boost-filesystem", "boost-system", From 3282c0d2e6beeb985596556393618667b9ffe84d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 11 Jan 2022 08:08:36 +0100 Subject: [PATCH 33/33] Update versions --- versions/p-/pdal-c.json | 2 +- versions/p-/pdal.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index e7a2da8d348bf3..0eb2c8be9f68e4 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fa6ad95c56f1e27fb02f7fe229e84378dd521011", + "git-tree": "c19bcf077b95f0d81ef14bfdf9774795521d6013", "version-string": "2.1", "port-version": 0 }, diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index dce929f50f53f4..d9f41bdfc13457 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d8a87a597c7f27d86d36ea806a41f9a97b49f214", + "git-tree": "408d14a540c0a1e217efec2deea453594d9d1bde", "version": "2.3.0", "port-version": 0 },