mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 01:51:39 +08:00
25eb51a36b
* 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
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
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}
|
|
PRIVATE
|
|
${CMAKE_THREAD_LIBS_INIT}
|
|
- ${GDAL_LIBRARY}
|
|
+ ${GDAL_LIBRARIES}
|
|
${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)
|