aboutsummaryrefslogtreecommitdiff
path: root/ports/pdal
diff options
context:
space:
mode:
Diffstat (limited to 'ports/pdal')
-rw-r--r--ports/pdal/FindGeoTIFF.cmake13
-rw-r--r--ports/pdal/portfile.cmake12
2 files changed, 4 insertions, 21 deletions
diff --git a/ports/pdal/FindGeoTIFF.cmake b/ports/pdal/FindGeoTIFF.cmake
deleted file mode 100644
index 51a5fb2d8..000000000
--- a/ports/pdal/FindGeoTIFF.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-find_path(GEOTIFF_INCLUDE_DIR geotiff.h)
-
-find_library(GEOTIFF_LIBRARY_DEBUG NAMES geotiff_d)
-find_library(GEOTIFF_LIBRARY_RELEASE NAMES geotiff)
-
-include(SelectLibraryConfigurations)
-select_library_configurations(GEOTIFF)
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
- GEOTIFF DEFAULT_MSG
- GEOTIFF_LIBRARY GEOTIFF_INCLUDE_DIR
-)
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
index 6ab78024f..2ceaf99ab 100644
--- a/ports/pdal/portfile.cmake
+++ b/ports/pdal/portfile.cmake
@@ -21,14 +21,10 @@ vcpkg_extract_source_archive_ex(
)
file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp")
-
-# Deploy custom CMake modules to enforce expected dependencies look-up
-foreach(_module IN ITEMS FindGDAL FindGEOS FindGeoTIFF)
- file(REMOVE "${SOURCE_PATH}/cmake/modules/${_module}.cmake")
- file(COPY ${CMAKE_CURRENT_LIST_DIR}/${_module}.cmake
- DESTINATION ${SOURCE_PATH}/cmake/modules/
- )
-endforeach()
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGDAL.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGEOS.cmake")
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/cmake/modules/)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGEOS.cmake DESTINATION ${SOURCE_PATH}/cmake/modules/)
# NOTE: CMake native BUILD_SHARED_LIBS option will be set by vcpkg_configure_cmake
# TODO: Remove this as soon as PDAL switches to use BUILD_SHARED_LIBS