mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-25 07:29:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
e527f179b1
vcpkg/ports/pdal/fix-dependency.patch

34 lines
1.1 KiB
Diff
Raw Normal View History

[pdal] fix static build (#9308) * [pdal] fix static build * update baseline * [pdal] Re-fix find dependency geos * [padl] Find library geos_c/libgeos_c instead of library geos/libgeos * [pdal] Fix dependency boost * update baseline
2020-01-07 04:44:46 +08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
[pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build (#31257) * [pdal] Update to v2.5.3 * [pdal] Update baseline * [pdal-c] Update to v2.2.0 * [pdal-c] Update baseline * update usage * update version --------- Co-authored-by: Monica <v-liumonica@microsoft.com>
2023-05-09 09:28:15 +08:00
index 1705a8426..248edcd38 100644
[pdal] fix static build (#9308) * [pdal] fix static build * update baseline * [pdal] Re-fix find dependency geos * [padl] Find library geos_c/libgeos_c instead of library geos/libgeos * [pdal] Fix dependency boost * update baseline
2020-01-07 04:44:46 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build (#31257) * [pdal] Update to v2.5.3 * [pdal] Update baseline * [pdal-c] Update to v2.2.0 * [pdal-c] Update baseline * update usage * update version --------- Co-authored-by: Monica <v-liumonica@microsoft.com>
2023-05-09 09:28:15 +08:00
@@ -269,7 +269,7 @@ target_link_libraries(${PDAL_BASE_LIB_NAME}
[pdal] fix static build (#9308) * [pdal] fix static build * update baseline * [pdal] Re-fix find dependency geos * [padl] Find library geos_c/libgeos_c instead of library geos/libgeos * [pdal] Fix dependency boost * update baseline
2020-01-07 04:44:46 +08:00
PRIVATE
[pdal] Revise and update (#21275) * Modernize portfile, use vcpkg_from_github * Revise cleanup and tool installation * Fix static linkage with gdal * Fix static linkage with PostgreSQL * Fix compiler options * Fix APPLE linker flags * Don't use /usr/local/include * Remove pdal failure from CI baseline * Remove outdated FindICONV.cmake * Simplify geos package lookup * Separate boost patch from other dependencies * Simplify boost patching * Update to 2.3.0 * PDAL supports only dynamic linkage * Normalize find_library * Dependencies, features and plugins * Update pdalboost fixup * Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. * Override absolute plugin path * Don't set RPATH * Add usage * [pdal-c] Update portfile * [pdal-c] Don't enforce pdal features * [pdal-c] Update to v2.1.0 * Update versions * Convert tabs * Update versions * Patch NOMINMAX definition * Update versions * Use project include instead of patch * Update versions * Update 'supports' field * Update versions
2022-01-12 06:56:08 +08:00
${CMAKE_THREAD_LIBS_INIT}
[pdal] Update to 2.4.0 (#24355) * Update to 2.4.0 * Update versions * Use check, not patch, for C++17 filesystem support * Update versions * Update license * De-vendor nanoflann and nlohmann-json * Update versions * Fix nlohmann de-vendoring * Update versions
2022-05-07 07:30:21 +08:00
${CMAKE_DL_LIBS}
[pdal] Revise and update (#21275) * Modernize portfile, use vcpkg_from_github * Revise cleanup and tool installation * Fix static linkage with gdal * Fix static linkage with PostgreSQL * Fix compiler options * Fix APPLE linker flags * Don't use /usr/local/include * Remove pdal failure from CI baseline * Remove outdated FindICONV.cmake * Simplify geos package lookup * Separate boost patch from other dependencies * Simplify boost patching * Update to 2.3.0 * PDAL supports only dynamic linkage * Normalize find_library * Dependencies, features and plugins * Update pdalboost fixup * Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. * Override absolute plugin path * Don't set RPATH * Add usage * [pdal-c] Update portfile * [pdal-c] Don't enforce pdal features * [pdal-c] Update to v2.1.0 * Update versions * Convert tabs * Update versions * Patch NOMINMAX definition * Update versions * Use project include instead of patch * Update versions * Update 'supports' field * Update versions
2022-01-12 06:56:08 +08:00
- ${GDAL_LIBRARY}
+ ${GDAL_LIBRARIES}
${GEOTIFF_LIBRARY}
${LIBXML2_LIBRARIES}
[pdal] Update to 2.4.0 (#24355) * Update to 2.4.0 * Update versions * Use check, not patch, for C++17 filesystem support * Update versions * Update license * De-vendor nanoflann and nlohmann-json * Update versions * Fix nlohmann de-vendoring * Update versions
2022-05-07 07:30:21 +08:00
${ZLIB_LIBRARIES}
[pdal] Revise and update (#21275) * Modernize portfile, use vcpkg_from_github * Revise cleanup and tool installation * Fix static linkage with gdal * Fix static linkage with PostgreSQL * Fix compiler options * Fix APPLE linker flags * Don't use /usr/local/include * Remove pdal failure from CI baseline * Remove outdated FindICONV.cmake * Simplify geos package lookup * Separate boost patch from other dependencies * Simplify boost patching * Update to 2.3.0 * PDAL supports only dynamic linkage * Normalize find_library * Dependencies, features and plugins * Update pdalboost fixup * Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. * Override absolute plugin path * Don't set RPATH * Add usage * [pdal-c] Update portfile * [pdal-c] Don't enforce pdal features * [pdal-c] Update to v2.1.0 * Update versions * Convert tabs * Update versions * Patch NOMINMAX definition * Update versions * Use project include instead of patch * Update versions * Update 'supports' field * Update versions
2022-01-12 06:56:08 +08:00
diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake
[pdal, pdal-c] Update to v2.5.3, v2.2.0 and fix GCC 13 build (#31257) * [pdal] Update to v2.5.3 * [pdal] Update baseline * [pdal-c] Update to v2.2.0 * [pdal-c] Update baseline * update usage * update version --------- Co-authored-by: Monica <v-liumonica@microsoft.com>
2023-05-09 09:28:15 +08:00
index dfe3dc024..42a78d646 100644
[pdal] Revise and update (#21275) * Modernize portfile, use vcpkg_from_github * Revise cleanup and tool installation * Fix static linkage with gdal * Fix static linkage with PostgreSQL * Fix compiler options * Fix APPLE linker flags * Don't use /usr/local/include * Remove pdal failure from CI baseline * Remove outdated FindICONV.cmake * Simplify geos package lookup * Separate boost patch from other dependencies * Simplify boost patching * Update to 2.3.0 * PDAL supports only dynamic linkage * Normalize find_library * Dependencies, features and plugins * Update pdalboost fixup * Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. * Override absolute plugin path * Don't set RPATH * Add usage * [pdal-c] Update portfile * [pdal-c] Don't enforce pdal features * [pdal-c] Update to v2.1.0 * Update versions * Convert tabs * Update versions * Patch NOMINMAX definition * Update versions * Use project include instead of patch * Update versions * Update 'supports' field * Update versions
2022-01-12 06:56:08 +08:00
--- a/cmake/zstd.cmake
+++ b/cmake/zstd.cmake
[pdal] Update to 2.4.0 (#24355) * Update to 2.4.0 * Update versions * Use check, not patch, for C++17 filesystem support * Update versions * Update license * De-vendor nanoflann and nlohmann-json * Update versions * Fix nlohmann de-vendoring * Update versions
2022-05-07 07:30:21 +08:00
@@ -4,7 +4,14 @@
[pdal] Revise and update (#21275) * Modernize portfile, use vcpkg_from_github * Revise cleanup and tool installation * Fix static linkage with gdal * Fix static linkage with PostgreSQL * Fix compiler options * Fix APPLE linker flags * Don't use /usr/local/include * Remove pdal failure from CI baseline * Remove outdated FindICONV.cmake * Simplify geos package lookup * Separate boost patch from other dependencies * Simplify boost patching * Update to 2.3.0 * PDAL supports only dynamic linkage * Normalize find_library * Dependencies, features and plugins * Update pdalboost fixup * Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. * Override absolute plugin path * Don't set RPATH * Add usage * [pdal-c] Update portfile * [pdal-c] Don't enforce pdal features * [pdal-c] Update to v2.1.0 * Update versions * Convert tabs * Update versions * Patch NOMINMAX definition * Update versions * Use project include instead of patch * Update versions * Update 'supports' field * Update versions
2022-01-12 06:56:08 +08:00
option(WITH_ZSTD
"Build support for compression/decompression with Zstd." TRUE)
if (WITH_ZSTD)
- find_package(ZSTD QUIET)
[pdal] Update to 2.4.0 (#24355) * Update to 2.4.0 * Update versions * Use check, not patch, for C++17 filesystem support * Update versions * Update license * De-vendor nanoflann and nlohmann-json * Update versions * Fix nlohmann de-vendoring * Update versions
2022-05-07 07:30:21 +08:00
+ find_package(ZSTD NAMES zstd REQUIRED)
[pdal] Revise and update (#21275) * Modernize portfile, use vcpkg_from_github * Revise cleanup and tool installation * Fix static linkage with gdal * Fix static linkage with PostgreSQL * Fix compiler options * Fix APPLE linker flags * Don't use /usr/local/include * Remove pdal failure from CI baseline * Remove outdated FindICONV.cmake * Simplify geos package lookup * Separate boost patch from other dependencies * Simplify boost patching * Update to 2.3.0 * PDAL supports only dynamic linkage * Normalize find_library * Dependencies, features and plugins * Update pdalboost fixup * Fixup pkgconfig "Requires" in pc file is incomplete, and not needed for dynamic linkage in vcpkg. * Override absolute plugin path * Don't set RPATH * Add usage * [pdal-c] Update portfile * [pdal-c] Don't enforce pdal features * [pdal-c] Update to v2.1.0 * Update versions * Convert tabs * Update versions * Patch NOMINMAX definition * Update versions * Use project include instead of patch * Update versions * Update 'supports' field * Update versions
2022-01-12 06:56:08 +08:00
+ 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)
Reference in New Issue Copy Permalink